Refactor bulk pubkey export names

vacuumlabs · Jan 14, 2021 · 4c7dba4 · 4c7dba4
1 parent 589aab9
commit 4c7dba4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/app/frontend/actions.ts b/app/frontend/actions.ts
@@ -121,14 +121,12 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
 
   const loadWallet = async (
     state,
-    {cryptoProviderType, walletSecretDef, forceWebUsb, bulkExportPubKeys}
+    {cryptoProviderType, walletSecretDef, forceWebUsb, shouldExportPubKeyBulk}
   ) => {
-    // loadingAction(state, `Waiting for ${state.hwWalletName}...`)
     loadingAction(state, 'Loading wallet data...', {
       walletLoadingError: undefined,
     })
     const isShelleyCompatible = !(walletSecretDef && walletSecretDef.derivationScheme.type === 'v1')
-    const shouldExportPubKeyBulk = bulkExportPubKeys
     const config = {...ADALITE_CONFIG, isShelleyCompatible, shouldExportPubKeyBulk}
     try {
       const cryptoProvider = await ShelleyCryptoProviderFactory.getCryptoProvider(

diff --git a/app/frontend/components/pages/login/hardwareAuth.tsx b/app/frontend/components/pages/login/hardwareAuth.tsx
@@ -61,7 +61,7 @@ const LoadByHardwareWalletSection = ({loadWallet}: Props) => {
             onClick={() =>
               loadWallet({
                 cryptoProviderType: CRYPTO_PROVIDER_TYPES.TREZOR,
-                bulkExportPubKeys: !dontBulkExportPubKeys,
+                shouldExportPubKeyBulk: !dontBulkExportPubKeys,
               })
             }
           >
@@ -93,7 +93,7 @@ const LoadByHardwareWalletSection = ({loadWallet}: Props) => {
             onClick={() =>
               loadWallet({
                 cryptoProviderType: CRYPTO_PROVIDER_TYPES.LEDGER,
-                bulkExportPubKeys: !dontBulkExportPubKeys,
+                shouldExportPubKeyBulk: !dontBulkExportPubKeys,
               })
             }
           >
@@ -110,7 +110,7 @@ const LoadByHardwareWalletSection = ({loadWallet}: Props) => {
               loadWallet({
                 cryptoProviderType: CRYPTO_PROVIDER_TYPES.LEDGER,
                 forceWebUsb: true,
-                bulkExportPubKeys: !dontBulkExportPubKeys,
+                shouldExportPubKeyBulk: !dontBulkExportPubKeys,
               })
             }
           >

diff --git a/app/frontend/components/pages/login/keyFileAuth.tsx b/app/frontend/components/pages/login/keyFileAuth.tsx
@@ -82,7 +82,7 @@ class LoadKeyFileClass extends Component<Props, State> {
       this.props.loadWallet({
         cryptoProviderType: CRYPTO_PROVIDER_TYPES.WALLET_SECRET,
         walletSecretDef,
-        bulkExportPubKeys: true,
+        shouldExportPubKeyBulk: true,
       })
     } catch (e) {
       this.props.stopLoadingAction()
@@ -145,7 +145,7 @@ class LoadKeyFileClass extends Component<Props, State> {
             this.props.loadWallet({
               cryptoProviderType: CRYPTO_PROVIDER_TYPES.WALLET_SECRET,
               walletSecretDef,
-              bulkExportPubKeys: true,
+              shouldExportPubKeyBulk: true,
             })
             this.setState({keyfileError: undefined})
           }

diff --git a/app/frontend/components/pages/login/mnemonicAuth.tsx b/app/frontend/components/pages/login/mnemonicAuth.tsx
@@ -42,7 +42,7 @@ class LoadByMnemonicSectionClass extends Component<Props> {
     await this.props.loadWallet({
       cryptoProviderType: CRYPTO_PROVIDER_TYPES.WALLET_SECRET,
       walletSecretDef: await mnemonicToWalletSecretDef(sanitizedMnemonic),
-      bulkExportPubKeys: true,
+      shouldExportPubKeyBulk: true,
     })
   }
 
@@ -96,7 +96,7 @@ class LoadByMnemonicSectionClass extends Component<Props> {
                 cryptoProviderType: CRYPTO_PROVIDER_TYPES.WALLET_SECRET,
                 // TODO(ppershing): get rid of mnemonic sanitization in this component
                 walletSecretDef: await mnemonicToWalletSecretDef(sanitizedMnemonic),
-                bulkExportPubKeys: true,
+                shouldExportPubKeyBulk: true,
               })
             }
             {...tooltip(