wip

Emurgo · Jan 13, 2025 · 747fec9 · 747fec9
1 parent e266935
commit 747fec9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
@@ -563,7 +563,7 @@ export function wrapGovernance(governanceProps: StoresProps, children: Node): No
   );
 }
 export function wrapPortfolio(portfolioProps: StoresProps, children: Node): Node {
-  const currentWalletInfo = createCurrrentWalletInfo(portfolioProps.stores);
+  const currentWalletInfo = React.useMemo(() => createCurrrentWalletInfo(portfolioProps.stores), [portfolioProps.stores]);
 
   const openDialogWrapper = (dialog): void => {
     portfolioProps.stores.uiDialogs.open({ dialog });

diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/HeaderPrice.tsx b/packages/yoroi-extension/app/UI/features/portfolio/common/components/HeaderPrice.tsx
@@ -11,7 +11,7 @@ export const HeaderPrice = ({ isLoading = false }) => {
 
   return (
     <Typography color="ds.text_gray_low" mr="12px">
-      {accountPair?.to.value} {accountPair?.to.name}
+      000 {accountPair?.to.value} {accountPair?.to.name}
     </Typography>
   );
 };
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.tsx b/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.tsx
@@ -43,7 +43,7 @@ const PortfolioHeader = ({ walletBalance, setKeyword, isLoading, tooltipTitle }:
   const [loading, setLoading] = React.useState(false);
   const strings = useStrings();
   const theme: any = useTheme();
-  const { unitOfAccount, changeUnitOfAccountPair, accountPair, primaryTokenInfo } = usePortfolio();
+  const { unitOfAccount, walletAdaBalance, changeUnitOfAccountPair, accountPair, primaryTokenInfo } = usePortfolio();
   const { tokenActivity } = usePortfolioTokenActivity();
   const localStorageApi = new LocalStorageApi();
 
@@ -94,8 +94,9 @@ const PortfolioHeader = ({ walletBalance, setKeyword, isLoading, tooltipTitle }:
       };
 
       if (portfolioStoragePairObj !== undefined) {
+        const fromValue = portfolioStoragePairObj.from.value !== walletBalance.ada ? walletBalance.ada : portfolioStoragePairObj.from.value;
         changeUnitOfAccountPair({
-          from: { name: portfolioStoragePairObj.from.name, value: portfolioStoragePairObj.from.value },
+          from: { name: portfolioStoragePairObj.from.name, value: fromValue },
           to: { name: portfolioStoragePairObj.to.name, value: !showADA ? walletBalance.ada : totalTokenPrice },
         });
       } else {
@@ -106,7 +107,7 @@ const PortfolioHeader = ({ walletBalance, setKeyword, isLoading, tooltipTitle }:
     };
 
     setFiatPair();
-  }, [totalTokenPrice, walletBalance, showADA]);
+  }, [totalTokenPrice, walletBalance, walletAdaBalance, showADA]);
 
   if (!accountPair) {
     return <LoadingSkeleton />;
@@ -120,7 +121,7 @@ const PortfolioHeader = ({ walletBalance, setKeyword, isLoading, tooltipTitle }:
             <Skeleton width="146px" height="24px" />
           ) : (
             <Typography variant="h2" fontWeight="500" color="ds.gray_cmax">
-              {String(accountPair?.from.value)}
+              0000 {String(accountPair?.from.value)}
             </Typography>
           )}
           <CurrencyDisplay from={accountPair?.from?.name} handleCurrencyChange={handleCurrencyChange} />

diff --git a/packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.tsx b/packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.tsx
@@ -57,7 +57,8 @@ export const PortfolioContextProvider = ({
   currentWallet,
   openDialogWrapper,
 }: PortfolioProviderProps) => {
-  const { walletBalance, ftAssetList, selectedWallet, networkId, primaryTokenInfo, backendServiceZero, explorer } = currentWallet;
+  const { walletBalance, walletAdaBalance, ftAssetList, selectedWallet, networkId, primaryTokenInfo, backendServiceZero, explorer } = currentWallet;
+
   if (selectedWallet === undefined) {
     return <></>;
   }
@@ -91,6 +92,7 @@ export const PortfolioContextProvider = ({
       ...actions,
       settingFiatPairUnit,
       walletBalance,
+      walletAdaBalance,
       ftAssetList: ftAssetList || [],
       networkId,
       primaryTokenInfo,
@@ -99,7 +101,7 @@ export const PortfolioContextProvider = ({
       backendServiceZero: backendServiceZero,
       explorer,
     }),
-    [state, actions, ftAssetList]
+    [state, currentWallet, actions, ftAssetList]
   );
 
   return <PortfolioContext.Provider value={context}>{children}</PortfolioContext.Provider>;

diff --git a/packages/yoroi-extension/app/UI/features/portfolio/module/state.ts b/packages/yoroi-extension/app/UI/features/portfolio/module/state.ts
@@ -37,6 +37,7 @@ export type PortfolioState = {
   };
   accountPair: AccountPair | null;
   walletBalance: WalletBalance | null;
+  walletAdaBalance: number;
   networkId: number | null;
   ftAssetList: any[];
   showWelcomeBanner: boolean;
@@ -55,6 +56,7 @@ export const defaultPortfolioState: PortfolioState = {
   },
   accountPair: null,
   walletBalance: null,
+  walletAdaBalance: 0,
   networkId: null,
   ftAssetList: [],
   primaryTokenInfo: null,

diff --git a/packages/yoroi-extension/app/UI/utils/createCurrentWalletInfo.ts b/packages/yoroi-extension/app/UI/utils/createCurrentWalletInfo.ts
@@ -146,13 +146,13 @@ export const createCurrrentWalletInfo = (stores: any): CurrentWalletType | undef
   try {
     const walletCurrentPoolInfo = getStakePoolMeta(stores);
 
-    const selectedWallet /*: WalletState */ = wallets.selectedOrFail;
-    const walletAdaBalance /*: MultiToken */ = getWalletTotalAdaBalance(stores, selectedWallet);
-
+    const selectedWallet /*: WalletState */ = wallets.selected;
+
     if (selectedWallet == null) {
       throw new Error(`no selected Wallet. Should never happen`);
     }
-
+
+    const walletAdaBalance /*: MultiToken */ = getWalletTotalAdaBalance(stores, selectedWallet);
     const currentWalletId = selectedWallet.publicDeriverId;
     const networkId = selectedWallet.networkId;