refactor(data): ♻️ move state from main.js to state/index.js

Author: jojobyte

src/helpers/wallet.js

@@ -17,6 +17,9 @@ import {
   STOREAGE_SALT, OIDC_CLAIMS,
   KS_CIPHER, KS_PRF, USAGE,
 } from './constants.js'
+import {
+  walletFunds,
+} from '../state/index.js'
 
 // @ts-ignore
 import blake from 'blakejs'
@@ -831,7 +834,7 @@ export async function initWallet(
 // }
 
 export async function updateAddrFunds(
-  wallet, walletFunds, insightRes,
+  wallet, insightRes,
 ) {
   let updatedAt = Date.now()
   let { addrStr, ...res } = insightRes
@@ -889,12 +892,12 @@ export async function updateAddrFunds(
       if ($addr.accountIndex >= storeAcctLen) {
         batchGenAccts(wallet.recoveryPhrase, $addr.accountIndex)
           .then(() => {
-            // updateAllFunds(wallet, walletFunds)
+            // updateAllFunds(wallet)
             batchGenAcctsAddrs(wallet)
               .then(accts => {
                 console.log('batchGenAcctsAddrs', { accts })
 
-                updateAllFunds(wallet, walletFunds)
+                updateAllFunds(wallet)
                   .then(funds => {
                     console.log('updateAllFunds then funds', funds)
                   })
@@ -910,7 +913,7 @@ export async function updateAddrFunds(
   return { balance: 0 }
 }
 
-export async function updateAllFunds(wallet, walletFunds) {
+export async function updateAllFunds(wallet) {
   let funds = 0
   let addrKeys = await store.addresses.keys()
 
@@ -943,7 +946,7 @@ export async function updateAllFunds(wallet, walletFunds) {
     if (addrIdx > -1) {
       addrKeys.splice(addrIdx, 1)
     }
-    funds += (await updateAddrFunds(wallet, walletFunds, insightRes))?.balance || 0
+    funds += (await updateAddrFunds(wallet, insightRes))?.balance || 0
     walletFunds.balance = funds
   }
 
@@ -1275,7 +1278,7 @@ export async function deriveTxWallet(
   let cachedAddrs = {}
   let privateKeys = {}
   let coreUtxos
-  let txs
+  let transactions
   let tmpWallet
 
   if (Array.isArray(fundAddrs) && fundAddrs.length > 0) {
@@ -1302,7 +1305,7 @@ export async function deriveTxWallet(
     coreUtxos = await dashsight.getMultiCoreUtxos(
       Object.keys(privateKeys)
     )
-    txs = await dashsight.getAllTxs(
+    transactions = await dashsight.getAllTxs(
       Object.keys(privateKeys)
     )
   } else {
@@ -1324,17 +1327,18 @@ export async function deriveTxWallet(
     coreUtxos = await dashsight.getCoreUtxos(
       tmpWallet.address
     )
-    txs = await dashsight.getAllTxs(
+    transactions = await dashsight.getAllTxs(
       [tmpWallet.address]
     )
   }
 
-  console.log('getAllTxs', txs)
+  console.log('getAllTxs', transactions)
 
   return {
     privateKeys,
     cachedAddrs,
     coreUtxos,
+    transactions,
   }
 }
 

src/main.js

@@ -3,23 +3,17 @@ import { lit as html } from './helpers/lit.js'
 import {
   generateWalletData,
   deriveWalletData,
-  envoy,
-  sortContactsByAlias,
   getStoreData,
   formDataEntries,
-  getAddressIndexFromUsage,
 } from './helpers/utils.js'
 
 import {
   DUFFS,
-  OIDC_CLAIMS,
-  // USAGE,
 } from './helpers/constants.js'
 
 import {
   findInStore,
   initDashSocket,
-  // batchAddressGenerate,
   batchGenAccts,
   batchGenAcctAddrs,
   batchGenAcctsAddrs,
@@ -35,13 +29,22 @@ import {
   getUnusedChangeAddress,
   getAccountWallet,
 } from './helpers/wallet.js'
+
 import {
   localForageBaseCfg,
   importFromJson,
   exportWalletData,
   saveJsonToFile,
 } from './helpers/db.js'
 
+import {
+  appState,
+  appTools,
+  appDialogs,
+  userInfo,
+  walletFunds,
+} from './state/index.js'
+
 import setupNav from './components/nav.js'
 import setupMainFooter from './components/main-footer.js'
 import setupSendRequestBtns from './components/send-request-btns.js'
@@ -75,80 +78,6 @@ let accounts
 let wallets
 let wallet
 
-let appState = envoy(
-  {
-    phrase: null,
-    encryptionPassword: null,
-    selectedWallet: '',
-    selectedAlias: '',
-    aliasInfo: {},
-    contacts: [],
-    sentTransactions: {},
-    account: {},
-  },
-  // async (state, oldState, prop) => {
-  //   if (prop === 'sentTransactions') {
-  //     console.log(prop, state[prop])
-  //   }
-  // },
-)
-let appTools = envoy(
-  {
-    storedData: {},
-  },
-)
-let userInfo = envoy(
-  {
-    ...OIDC_CLAIMS,
-  },
-  async (state, oldState, prop) => {
-    if (state[prop] !== oldState[prop]) {
-      let decryptedAlias = await appTools.storedData.decryptItem(
-        store.aliases,
-        appState.selectedAlias,
-      )
-      appTools.storedData.encryptItem(
-        store.aliases,
-        appState.selectedAlias,
-        {
-          ...decryptedAlias,
-          updatedAt: (new Date()).toISOString(),
-          info: {
-            ...decryptedAlias.info,
-            [prop]: state[prop],
-          },
-        },
-        false,
-      )
-    }
-  },
-)
-
-// rigs
-let appDialogs = envoy(
-  {
-    onboard: {},
-    phraseBackup: {},
-    phraseGenerate: {},
-    phraseImport: {},
-    walletEncrypt: {},
-    walletDecrypt: {},
-    addContact: {},
-    editContact: {},
-    editProfile: {},
-    scanContact: {},
-    sendOrReceive: {},
-    sendConfirm: {},
-    requestQr: {},
-  },
-)
-
-let walletFunds = envoy(
-  {
-    balance: 0
-  },
-)
-
 // element
 let bodyNav
 let dashBalance
@@ -571,7 +500,7 @@ async function main() {
 
   appDialogs.addContact = await addContactRig({
     setupDialog, updateAllFunds,
-    appDialogs, appState, appTools, store, walletFunds,
+    appDialogs, appState, appTools, store,
     mainApp, wallet, userInfo, contactsList,
   })
 
@@ -783,7 +712,7 @@ async function main() {
         .then(accts => {
           console.log('batchGenAcctsAddrs', { accts })
 
-          updateAllFunds(wallet, walletFunds)
+          updateAllFunds(wallet)
             .then(funds => {
               console.log('updateAllFunds then funds', funds)
             })
@@ -1016,7 +945,7 @@ async function main() {
         )
 
         setTimeout(() =>
-          updateAllFunds(wallet, walletFunds)
+          updateAllFunds(wallet)
             .then(funds => {
               console.log('updateAllFunds then funds', funds)
             })
@@ -1141,7 +1070,7 @@ async function main() {
         }
 
         setTimeout(() =>
-          updateAllFunds(wallet, walletFunds)
+          updateAllFunds(wallet)
             .then(funds => {
               console.log('updateAllFunds then funds', funds)
             })

src/state/index.js

@@ -0,0 +1,88 @@
+import {
+  OIDC_CLAIMS,
+} from '../helpers/constants.js'
+import {
+  envoy,
+} from '../helpers/utils.js'
+import {
+  store,
+} from '../helpers/wallet.js'
+
+export const appDialogs = envoy(
+  {
+    onboard: {},
+    phraseBackup: {},
+    phraseGenerate: {},
+    phraseImport: {},
+    walletEncrypt: {},
+    walletDecrypt: {},
+    addContact: {},
+    editContact: {},
+    editProfile: {},
+    scanContact: {},
+    sendOrReceive: {},
+    sendConfirm: {},
+    requestQr: {},
+  },
+)
+
+export const appState = envoy(
+  {
+    phrase: null,
+    encryptionPassword: null,
+    selectedWallet: '',
+    selectedAlias: '',
+    aliasInfo: {},
+    contacts: [],
+    sentTransactions: {},
+    transactions: [],
+    account: {},
+  },
+  // async (state, oldState, prop) => {
+  //   if (prop === 'sentTransactions') {
+  //     console.log(prop, state[prop])
+  //   }
+  // },
+)
+
+export const appTools = envoy(
+  {
+    storedData: {},
+  },
+)
+
+export const userInfo = envoy(
+  {
+    ...OIDC_CLAIMS,
+  },
+  async (state, oldState, prop) => {
+    if (
+      state[prop] !== oldState[prop] &&
+      appState.selectedAlias
+    ) {
+      let decryptedAlias = await appTools.storedData.decryptItem(
+        store.aliases,
+        appState.selectedAlias,
+      )
+      appTools.storedData.encryptItem(
+        store.aliases,
+        appState.selectedAlias,
+        {
+          ...decryptedAlias,
+          updatedAt: (new Date()).toISOString(),
+          info: {
+            ...decryptedAlias.info,
+            [prop]: state[prop],
+          },
+        },
+        false,
+      )
+    }
+  },
+)
+
+export const walletFunds = envoy(
+  {
+    balance: 0
+  },
+)