Rename new to next

vacuumlabs · Jan 12, 2021 · c3e0754 · c3e0754
1 parent d764874
commit c3e0754
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/app/frontend/actions.ts b/app/frontend/actions.ts
@@ -1055,17 +1055,17 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
     })
   }
 
-  const exploreNewAccount = async (state: State) => {
+  const exploreNextAccount = async (state: State) => {
     try {
       loadingAction(state, 'Loading account')
-      const newAccount = await wallet.exploreNewAccount()
-      const accountInfo = await newAccount.getAccountInfo(state.validStakepools)
+      const nextAccount = await wallet.exploreNextAccount()
+      const accountInfo = await nextAccount.getAccountInfo(state.validStakepools)
       const accountsInfo = [...state.accountsInfo, accountInfo]
       setState({
         accountsInfo,
         ...getWalletInfo(accountsInfo),
       })
-      setActiveAccount(state, newAccount.accountIndex)
+      setActiveAccount(state, nextAccount.accountIndex)
     } catch (e) {
       setErrorState('walletLoadingError', e)
       setState({
@@ -1545,7 +1545,7 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
     setActiveAccount,
     setTargetAccount,
     setSourceAccount,
-    exploreNewAccount,
+    exploreNextAccount,
     switchSourceAndTargetAccounts,
     loadPoolCertificateTx,
     downloadPoolSignature,

diff --git a/app/frontend/components/pages/accounts/accountTile.tsx b/app/frontend/components/pages/accounts/accountTile.tsx
@@ -13,7 +13,7 @@ type TileProps = {
   rewardsBalance: number | null
   shouldShowSaturatedBanner: boolean
   setActiveAccount: any
-  exploreNewAccount: any
+  exploreNextAccount: any
   activeAccountIndex: number
   showDelegationModal: any
   showSendTransactionModal: any
@@ -28,7 +28,7 @@ const AccountTile = ({
   rewardsBalance,
   shouldShowSaturatedBanner,
   setActiveAccount,
-  exploreNewAccount,
+  exploreNextAccount,
   activeAccountIndex,
   showDelegationModal,
   showSendTransactionModal,
@@ -87,7 +87,7 @@ const AccountTile = ({
     <button
       className="button primary nowrap"
       onClick={() => {
-        exploreNewAccount()
+        exploreNextAccount()
       }}
     >
       Explore

diff --git a/app/frontend/wallet/account-manager.ts b/app/frontend/wallet/account-manager.ts
@@ -9,7 +9,7 @@ const AccountManager = ({config, cryptoProvider, blockchainExplorer}) => {
     return accounts[accountIndex]
   }
 
-  function discoverNewAccount() {
+  function discoverNextAccount() {
     return Account({
       config,
       cryptoProvider,
@@ -18,7 +18,7 @@ const AccountManager = ({config, cryptoProvider, blockchainExplorer}) => {
     })
   }
 
-  async function addNewAccount(account) {
+  async function addNextAccount(account) {
     await account.init() // To ensure user exported pubkey
     const isLastAccountUsed =
       accounts.length > 0 ? await accounts[accounts.length - 1].isAccountUsed() : true
@@ -38,30 +38,30 @@ const AccountManager = ({config, cryptoProvider, blockchainExplorer}) => {
     const isBulkExportSupported = cryptoProvider.isFeatureSupported(
       CryptoProviderFeatures.BULK_EXPORT
     )
-    async function _discoverNewAccount(accountIndex: number) {
-      const newAccount = accounts[accountIndex] || discoverNewAccount()
+    async function _discoverNextAccount(accountIndex: number) {
+      const newAccount = accounts[accountIndex] || discoverNextAccount()
       const isAccountUsed = await newAccount.isAccountUsed()
-      if (accountIndex === accounts.length) await addNewAccount(newAccount)
+      if (accountIndex === accounts.length) await addNextAccount(newAccount)
       const shouldExplore = isAccountUsed && config.shouldExportPubKeyBulk && isBulkExportSupported
 
-      return shouldExplore && (await _discoverNewAccount(accountIndex + 1))
+      return shouldExplore && (await _discoverNextAccount(accountIndex + 1))
     }
-    await _discoverNewAccount(Math.max(0, accounts.length - 1))
+    await _discoverNextAccount(Math.max(0, accounts.length - 1))
     return accounts
   }
 
-  async function exploreNewAccount() {
+  async function exploreNextAccount() {
     // remove rejected promises from pubkey cache
     cryptoProvider.cleanXpubCache()
-    const newAccount = discoverNewAccount()
-    await addNewAccount(newAccount)
-    return newAccount
+    const nextAccount = discoverNextAccount()
+    await addNextAccount(nextAccount)
+    return nextAccount
   }
 
   return {
     getAccount,
     discoverAccounts,
-    exploreNewAccount,
+    exploreNextAccount,
   }
 }
 

diff --git a/app/frontend/wallet/shelley-wallet.ts b/app/frontend/wallet/shelley-wallet.ts
@@ -64,7 +64,7 @@ const ShelleyWallet = ({config, cryptoProvider}) => {
     getAccountsInfo,
     getValidStakepools,
     getAccount: accountManager.getAccount,
-    exploreNewAccount: accountManager.exploreNewAccount,
+    exploreNextAccount: accountManager.exploreNextAccount,
   }
 }