Skip to content
This repository was archived by the owner on Apr 10, 2025. It is now read-only.

fix: #214: use selected sub-account in order forms #225

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions src/pages/trade/ui/order-form/store/OrderFormStore.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect } from 'react';
import { useCallback, useEffect } from 'react';
import { makeAutoObservable, reaction, runInAction } from 'mobx';
import { LimitOrderFormStore } from './LimitOrderFormStore';
import { MarketOrderFormStore } from './MarketOrderFormStore';
Expand All @@ -15,7 +15,6 @@ import {
} from '@penumbra-zone/protobuf/penumbra/core/keys/v1/keys_pb';
import { usePathToMetadata } from '@/pages/trade/model/use-path';
import { useBalances } from '@/shared/api/balances';
import { Amount } from '@penumbra-zone/protobuf/penumbra/core/num/v1/num_pb';
import { connectionStore } from '@/shared/model/connection';
import { useSubaccounts } from '@/widgets/header/api/subaccounts';
import { useMarketPrice } from '@/pages/trade/model/useMarketPrice';
Expand All @@ -25,6 +24,13 @@ import debounce from 'lodash/debounce';
import { useRegistryAssets } from '@/shared/api/registry';
import { plan, planBuildBroadcast } from '../helpers';
import { openToast } from '@penumbra-zone/ui/Toast';
import {
getMetadataFromBalancesResponse,
getAmount,
getAddressIndex,
} from '@penumbra-zone/getters/balances-response';
import { isMetadataEqual } from '@/shared/utils/is-metadata-equal';
import { Metadata } from '@penumbra-zone/protobuf/penumbra/core/asset/v1/asset_pb';

export type WhichForm = 'Market' | 'Limit' | 'Range';

Expand Down Expand Up @@ -239,21 +245,6 @@ export class OrderFormStore {
}
}

const pluckAssetBalance = (symbol: string, balances: BalancesResponse[]): undefined | Amount => {
for (const balance of balances) {
if (!balance.balanceView?.valueView || balance.balanceView.valueView.case !== 'knownAssetId') {
continue;
}
if (balance.balanceView.valueView.value.metadata?.symbol === symbol) {
const amount = balance.balanceView.valueView.value.amount;
if (amount) {
return amount;
}
}
}
return undefined;
};

function getAccountAddress(subAccounts: AddressView[] | undefined) {
const subAccount = subAccounts ? subAccounts[connectionStore.subaccount] : undefined;
let addressIndex = undefined;
Expand All @@ -279,15 +270,29 @@ export const useOrderFormStore = () => {
const { baseAsset, quoteAsset } = usePathToMetadata();
const marketPrice = useMarketPrice();

// Finds a balance by given asset metadata and selected sub-account
const balanceFinder = useCallback(
(asset: Metadata, balance: BalancesResponse): boolean => {
const metadata = getMetadataFromBalancesResponse.optional(balance);
const address = getAddressIndex.optional(balance);
if (!metadata || !address || !addressIndex) {
return false;
}

return isMetadataEqual(metadata, asset) && addressIndex.equals(address);
},
[addressIndex],
);

useEffect(() => {
if (
baseAsset?.symbol &&
baseAsset.penumbraAssetId &&
quoteAsset?.symbol &&
quoteAsset.penumbraAssetId
) {
const baseBalance = balances && pluckAssetBalance(baseAsset.symbol, balances);
const quoteBalance = balances && pluckAssetBalance(quoteAsset.symbol, balances);
const baseBalance = getAmount.optional(balances?.find(balanceFinder.bind(null, baseAsset)));
const quoteBalance = getAmount.optional(balances?.find(balanceFinder.bind(null, quoteAsset)));

const baseAssetInfo = AssetInfo.fromMetadata(baseAsset, baseBalance);
const quoteAssetInfo = AssetInfo.fromMetadata(quoteAsset, quoteBalance);
Expand All @@ -312,7 +317,7 @@ export const useOrderFormStore = () => {
orderFormStore.setAssets(baseAssetInfo, quoteAssetInfo, isChangingAssetPair);
}
}
}, [baseAsset, quoteAsset, balances]);
}, [baseAsset, quoteAsset, balances, balanceFinder]);

useEffect(() => {
if (address && addressIndex) {
Expand Down
16 changes: 16 additions & 0 deletions src/shared/utils/is-metadata-equal.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Metadata } from '@penumbra-zone/protobuf/penumbra/core/asset/v1/asset_pb';

/**
* Compares two asset Metadata objects by penumbraAssetId.
*
* This function is preferable over simple `metadata.symbol` comparison since there could potentially be
* two or more assets with the same symbol but different `penumbraAssetId`. For example, for native
* asset within Penumbra and the bridged (ibc-ed) asset.
* */
export const isMetadataEqual = (a: Metadata, b: Metadata): boolean => {
if (a.penumbraAssetId && b.penumbraAssetId) {
return a.penumbraAssetId.equals(b.penumbraAssetId);
}

return a.symbol === b.symbol;
};