Merge pull request #781 from alephium/pre-release-fixes

Pre release fixes
alephium · Aug 16, 2023 · 3110a53 · 3110a53
2 parents 66d28c4 + 29d30de
commit 3110a53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/pages/UnlockedWallet/OverviewPage/AmountsOverviewPanel.tsx b/src/pages/UnlockedWallet/OverviewPage/AmountsOverviewPanel.tsx
@@ -83,8 +83,7 @@ const AmountsOverviewPanel: FC<AmountsOverviewPanelProps> = ({ className, addres
   const totalBalance = addresses.reduce((acc, address) => acc + BigInt(address.balance), BigInt(0))
   const totalAvailableBalance = addresses.reduce((acc, address) => acc + getAvailableBalance(address), BigInt(0))
   const totalLockedBalance = addresses.reduce((acc, address) => acc + BigInt(address.lockedBalance), BigInt(0))
-  const totalAmountWorth =
-    price !== undefined && !stateUninitialized ? calculateAmountWorth(totalBalance, price) : undefined
+  const totalAmountWorth = price !== undefined ? calculateAmountWorth(totalBalance, price) : undefined
   const balanceInFiat = worth ?? totalAmountWorth
 
   const isOnline = network.status === 'online'

diff --git a/src/storage/global/globalSlice.ts b/src/storage/global/globalSlice.ts
@@ -137,7 +137,7 @@ const toggleLoading = (state: AppState, toggle: boolean, enableLoading?: boolean
   if (enableLoading !== false) state.loading = toggle
 }
 
-const resetState = ({ theme, wallets }: AppState) => ({ ...initialState, wallets, theme })
+const resetState = ({ theme }: AppState) => ({ ...initialState, wallets: WalletStorage.list(), theme })
 
 const refreshWalletList = (state: AppState) => {
   state.wallets = WalletStorage.list()