Refactor total balance calculation

Refactor bulkexport checkbox

Fix saturation and premium banner

.gitignore

@@ -14,5 +14,4 @@ app/dist/
 server.cert
 server.key
 app/tests/.chrome/*
-app/tests/*.module.wasm
-.scannerwork
+app/tests/*.module.wasm

app/frontend/actions.ts

@@ -37,7 +37,6 @@ import {localStorageVars} from './localStorage'
 
 let wallet: ReturnType<typeof Wallet>
 let account: ReturnType<typeof Account>
-let cryptoProvider
 
 const debounceEvent = (callback, time) => {
   let interval
@@ -132,20 +131,28 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
     const shouldExportPubKeyBulk = bulkExportPubKeys
     const config = {...ADALITE_CONFIG, isShelleyCompatible, shouldExportPubKeyBulk}
     try {
-      cryptoProvider = await ShelleyCryptoProviderFactory.getCryptoProvider(cryptoProviderType, {
-        walletSecretDef,
-        network: NETWORKS.SHELLEY[ADALITE_CONFIG.ADALITE_NETWORK],
-        config: ADALITE_CONFIG,
-        forceWebUsb,
-      })
+      const cryptoProvider = await ShelleyCryptoProviderFactory.getCryptoProvider(
+        cryptoProviderType,
+        {
+          walletSecretDef,
+          network: NETWORKS.SHELLEY[ADALITE_CONFIG.ADALITE_NETWORK],
+          config,
+          forceWebUsb, // TODO: into config
+        }
+      )
 
       wallet = await Wallet({
         config,
         cryptoProvider,
       })
 
-      const accountsInfo = await wallet.getAccountsInfo()
-      account = wallet.accounts[0] // THIS is not right
+      const {
+        accountsInfo,
+        totalRewardsBalance,
+        totalWalletBalance,
+        shouldShowSaturatedBanner,
+      } = await wallet.getAccountsInfo()
+      account = wallet.accounts[0] // TODO: Make accounts private
 
       const conversionRatesPromise = getConversionRates(state)
       const usingHwWallet = wallet.isHwWallet()
@@ -158,11 +165,13 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
       const autoLogin = state.autoLogin
       const ticker2Id = null
       const shouldShowPremiumBanner =
-        state.shouldShowPremiumBanner && PREMIUM_MEMBER_BALANCE_TRESHHOLD < 0
-      // should work for full wallet balance
-      const isBigDelegator = BIG_DELEGATOR_THRESHOLD > 0 // todo
+        state.shouldShowPremiumBanner && PREMIUM_MEMBER_BALANCE_TRESHHOLD < totalWalletBalance
+      const isBigDelegator = totalWalletBalance > BIG_DELEGATOR_THRESHOLD
       setState({
         accounts: accountsInfo,
+        totalWalletBalance,
+        totalRewardsBalance,
+        shouldShowSaturatedBanner,
         walletIsLoaded: true,
         ...accountsInfo[0],
         loading: false,
@@ -203,18 +212,24 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
     return true
   }
 
-  //TODO reloadAccountInfo function
-
   const reloadWalletInfo = async (state) => {
     loadingAction(state, 'Reloading wallet info...')
     try {
-      const accountsInfo = await wallet.getAccountsInfo()
+      const {
+        accountsInfo,
+        totalRewardsBalance,
+        totalWalletBalance,
+        shouldShowSaturatedBanner,
+      } = await wallet.getAccountsInfo()
       const conversionRates = getConversionRates(state)
 
       // timeout setting loading state, so that loading shows even if everything was cached
       setTimeout(() => setState({loading: false}), 500)
       setState({
         accounts: accountsInfo,
+        totalWalletBalance,
+        totalRewardsBalance,
+        shouldShowSaturatedBanner,
         ...accountsInfo[account.accountIndex],
       })
       await fetchConversionRates(conversionRates)

app/frontend/components/pages/accounts/accounts.tsx

@@ -184,17 +184,10 @@ const Accounts = ({
   shouldShowSendTransactionModal,
   shouldShowDelegationModal,
   selectedAccount,
+  totalWalletBalance,
+  totalRewardsBalance,
 }) => {
   const accountInfos = Object.values(accounts)
-  const totalBalance = accountInfos.reduce(
-    (a, {shelleyBalances}) =>
-      shelleyBalances.stakingBalance + shelleyBalances.nonStakingBalance + a,
-    0
-  )
-  const totalRewardBalance = accountInfos.reduce(
-    (a, {shelleyBalances}) => shelleyBalances.rewardsAccountBalance + a,
-    0
-  )
   const firstAddressPerAccount = accountInfos.map((e: any) => e.visibleAddresses[0].address)
   const InfoAlert = () => (
     <Fragment>
@@ -236,14 +229,14 @@ const Accounts = ({
             <div className="item">
               <h2 className="card-title small-margin">Total balance</h2>
               <div className="balance-amount">
-                {printAda(totalBalance as Lovelace)}
+                {printAda(totalWalletBalance as Lovelace)}
                 <AdaIcon />
               </div>
             </div>
             <div className="item">
               <h2 className="card-title small-margin">Total rewards balance</h2>
               <div className="balance-amount">
-                {printAda(totalRewardBalance as Lovelace)}
+                {printAda(totalRewardsBalance as Lovelace)}
                 <AdaIcon />
               </div>
             </div>
@@ -293,6 +286,8 @@ export default connect(
     shouldShowSendTransactionModal: state.shouldShowSendTransactionModal,
     shouldShowDelegationModal: state.shouldShowDelegationModal,
     selectedAccount: state.selectedAccount,
+    totalRewardsBalance: state.totalRewardsBalance,
+    totalWalletBalance: state.totalWalletBalance,
   }),
   actions
 )(Accounts)

app/frontend/components/pages/dashboard/dashboardPage.tsx

@@ -220,7 +220,7 @@ export default connect(
     isShelleyCompatible: state.isShelleyCompatible,
     shouldShowNonShelleyCompatibleDialog: state.shouldShowNonShelleyCompatibleDialog,
     shouldShowPremiumBanner: state.shouldShowPremiumBanner,
-    shouldShowSaturatedBanner: state.poolRecommendation.shouldShowSaturatedBanner,
+    shouldShowSaturatedBanner: state.shouldShowSaturatedBanner,
     selectedAccount: state.selectedAccount,
   }),
   actions

app/frontend/components/pages/login/hardwareAuth.tsx

@@ -13,15 +13,15 @@ interface Props {
 }
 
 const LoadByHardwareWalletSection = ({loadWallet}: Props) => {
-  const [bulkExportPubKeys, setBulkExport] = useState(
+  const [dontBulkExportPubKeys, setBulkExport] = useState(
     window.localStorage.getItem(localStorageVars.BULK_EXPORT) === 'true'
   )
   const toggleBulkExport = useCallback(
     () => {
-      window.localStorage.setItem(localStorageVars.BULK_EXPORT, `${!bulkExportPubKeys}`)
-      setBulkExport(!bulkExportPubKeys)
+      window.localStorage.setItem(localStorageVars.BULK_EXPORT, `${!dontBulkExportPubKeys}`)
+      setBulkExport(!dontBulkExportPubKeys)
     },
-    [bulkExportPubKeys]
+    [dontBulkExportPubKeys]
   )
 
   const TrezorAffiliateLink = (title) => (
@@ -61,7 +61,7 @@ const LoadByHardwareWalletSection = ({loadWallet}: Props) => {
             onClick={() =>
               loadWallet({
                 cryptoProviderType: CRYPTO_PROVIDER_TYPES.TREZOR,
-                bulkExportPubKeys: !bulkExportPubKeys,
+                bulkExportPubKeys: !dontBulkExportPubKeys,
               })
             }
           >
@@ -93,7 +93,7 @@ const LoadByHardwareWalletSection = ({loadWallet}: Props) => {
             onClick={() =>
               loadWallet({
                 cryptoProviderType: CRYPTO_PROVIDER_TYPES.LEDGER,
-                bulkExportPubKeys: !bulkExportPubKeys,
+                bulkExportPubKeys: !dontBulkExportPubKeys,
               })
             }
           >
@@ -110,7 +110,7 @@ const LoadByHardwareWalletSection = ({loadWallet}: Props) => {
               loadWallet({
                 cryptoProviderType: CRYPTO_PROVIDER_TYPES.LEDGER,
                 forceWebUsb: true,
-                bulkExportPubKeys: !bulkExportPubKeys,
+                bulkExportPubKeys: !dontBulkExportPubKeys,
               })
             }
           >
@@ -122,7 +122,7 @@ const LoadByHardwareWalletSection = ({loadWallet}: Props) => {
         <label className="checkbox">
           <input
             type="checkbox"
-            checked={!bulkExportPubKeys}
+            checked={!dontBulkExportPubKeys}
             onChange={toggleBulkExport}
             className="checkbox-input"
           />

app/frontend/state.ts

@@ -144,11 +144,14 @@ export interface State {
     status: string
     shouldShowSaturatedBanner: boolean
   }
+  shouldShowSaturatedBanner?: boolean
   isBigDelegator: boolean
   accounts: any
   activeAccount: number
   selectedAccount: number
   targetAccount: number
+  totalWalletBalance: number
+  totalRewardsBalance: number
   shouldShowSendTransactionModal: boolean
   shouldShowDelegationModal: boolean
   sendTransactionTitle: string
@@ -265,6 +268,8 @@ const initialState: State = {
   activeAccount: 0,
   selectedAccount: 0,
   targetAccount: 0,
+  totalWalletBalance: 0,
+  totalRewardsBalance: 0,
   shouldShowSendTransactionModal: false,
   shouldShowDelegationModal: false,
   sendTransactionTitle: '',

app/frontend/wallet/wallet.ts

@@ -71,14 +71,27 @@ const Wallet = ({config, cryptoProvider}) => {
     return null
   }
 
-  function getBalance() {
-    return 0
-  }
-
   async function getAccountsInfo() {
     await discoverAccounts()
     const accountsInfo = await Promise.all(accounts.map((account) => account.getWalletInfo()))
-    return Object.assign({}, accountsInfo)
+    const totalWalletBalance = accountsInfo.reduce(
+      (a, {shelleyBalances}) =>
+        shelleyBalances.stakingBalance + shelleyBalances.nonStakingBalance + a,
+      0
+    )
+    const totalRewardsBalance = accountsInfo.reduce(
+      (a, {shelleyBalances}) => shelleyBalances.rewardsAccountBalance + a,
+      0
+    )
+    const shouldShowSaturatedBanner = accountsInfo.some(
+      ({poolRecommendation}) => poolRecommendation.shouldShowSaturatedBanner
+    )
+    return {
+      accountsInfo: Object.assign({}, accountsInfo),
+      totalWalletBalance,
+      totalRewardsBalance,
+      shouldShowSaturatedBanner,
+    }
   }
 
   return {
@@ -88,7 +101,6 @@ const Wallet = ({config, cryptoProvider}) => {
     getWalletSecretDef,
     fetchTxInfo,
     checkCryptoProviderVersion,
-    getBalance,
     accounts,
     loadNewAccount,
     discoverAccounts,