Show "-" balance in account selector instead of spinner if total=null

oasisprotocol · May 25, 2023 · d73b616 · d73b616
1 parent 67ffd82
commit d73b616
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/app/components/Toolbar/Features/AccountSelector/__tests__/Account.test.tsx b/src/app/components/Toolbar/Features/AccountSelector/__tests__/Account.test.tsx
@@ -13,7 +13,7 @@ const renderComponent = (store: any) =>
       <ThemeProvider>
         <Account
           address="oasis1qq3xrq0urs8qcffhvmhfhz4p0mu7ewc8rscnlwxe"
-          balance={1000n.toString()}
+          balance={{ available: '200', debonding: '0', delegations: '800', total: '1000' }}
           type={WalletType.Mnemonic}
           onClick={() => {}}
           isActive={false}

diff --git a/src/app/components/Toolbar/Features/AccountSelector/index.tsx b/src/app/components/Toolbar/Features/AccountSelector/index.tsx
@@ -21,14 +21,15 @@ import React, { memo, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
 import { StringifiedBigInt } from 'types/StringifiedBigInt'
+import { BalanceDetails } from '../../../../state/account/types'
 
 interface Props {
   closeHandler: () => any
 }
 
 interface AccountProps {
   address: string
-  balance: StringifiedBigInt | null
+  balance: BalanceDetails | undefined
   type: WalletType
   onClick: (address: string) => void
   path?: number[]
@@ -91,7 +92,7 @@ export const Account = memo((props: AccountProps) => {
             {walletTypes[props.type]} {props.pathDisplay && <Text size="small">({props.pathDisplay})</Text>}
           </Box>
           <Box height={'24px'}>
-            {props.balance ? <AmountFormatter amount={props.balance} /> : <Spinner />}
+            {props.balance ? <AmountFormatter amount={props.balance.total} /> : <Spinner />}
           </Box>
         </Box>
       </Box>
@@ -115,7 +116,7 @@ export const AccountSelector = memo((props: Props) => {
     <Account
       key={wallet.address}
       address={wallet.address}
-      balance={wallet.balance?.total}
+      balance={wallet.balance}
       type={wallet.type}
       onClick={switchAccount}
       isActive={wallet.address === activeAddress}

diff --git a/src/app/pages/OpenWalletPage/Features/ImportAccountsSelectionModal/index.tsx b/src/app/pages/OpenWalletPage/Features/ImportAccountsSelectionModal/index.tsx
@@ -43,7 +43,7 @@ function ImportAccountsSelector({ accounts }: ImportAccountsSelectorSelectorProp
       {accounts.map(a => (
         <Account
           address={a.address}
-          balance={a.balance ? a.balance.total : null}
+          balance={a.balance}
           type={a.type}
           onClick={toggleAccount}
           isActive={a.selected}