bitpay · gabrielbazan7 · Oct 1, 2024
diff --git a/src/components/styled/Containers.tsx b/src/components/styled/Containers.tsx
@@ -320,7 +320,7 @@ export const OptionListContainer = styled.View`
 
 export const OptionList = styled.TouchableOpacity`
   background-color: ${({theme: {dark}}) => (dark ? LightBlack : Feather)};
-  height: 100px;
+  height: auto;
   border-radius: 12px;
   margin-bottom: ${ScreenGutter};
   flex-direction: row;

diff --git a/src/navigation/onboarding/screens/CreateKey.tsx b/src/navigation/onboarding/screens/CreateKey.tsx
@@ -34,6 +34,7 @@ import {
   showBottomNotificationModal,
 } from '../../../store/app/app.actions';
 import {sleep} from '../../../utils/helper-methods';
+import {LogActions} from '../../../store/log';
 
 const CreateKeyContainer = styled.SafeAreaView`
   flex: 1;
@@ -164,11 +165,15 @@ const CreateOrImportKey = ({
                       key: createdKey,
                     }),
                   );
-                } catch (e: any) {
-                  logger.error(e.message);
+                } catch (err: any) {
+                  const errstring =
+                    err instanceof Error ? err.message : JSON.stringify(err);
+                  dispatch(
+                    LogActions.error(`Error creating key: ${errstring}`),
+                  );
                   dispatch(dismissOnGoingProcessModal());
                   await sleep(500);
-                  showErrorModal(e.message);
+                  showErrorModal(errstring);
                 }
               }}>
               {t('Create a Key')}

diff --git a/src/navigation/wallet/screens/AddingOptions.tsx b/src/navigation/wallet/screens/AddingOptions.tsx
@@ -21,11 +21,16 @@ import {Option} from './CreationOptions';
 import {useTranslation} from 'react-i18next';
 import {useAppDispatch, useAppSelector} from '../../../utils/hooks';
 import {Analytics} from '../../../store/analytics/analytics.effects';
-import {dismissOnGoingProcessModal} from '../../../store/app/app.actions';
+import {
+  dismissOnGoingProcessModal,
+  showBottomNotificationModal,
+} from '../../../store/app/app.actions';
 import {startOnGoingProcessModal} from '../../../store/app/app.effects';
 import {createMultipleWallets} from '../../../store/wallet/effects';
 import {getBaseAccountCreationCoinsAndTokens} from '../../../constants/currencies';
 import {successAddWallet} from '../../../store/wallet/wallet.actions';
+import {LogActions} from '../../../store/log';
+import {sleep} from '../../../utils/helper-methods';
 
 export type AddingOptionsParamList = {
   key: Key;
@@ -51,7 +56,7 @@ const AddingOptions: React.FC = () => {
       id: 'utxo-wallet',
       title: t('UTXO Wallet'),
       description: t(
-        'Dedicated to a single cryptocurrency like Bitcoin, Bitcoin Cash, Litecoin, and Dogecoin. Perfect for users focusing on one specific coin.',
+        'Dedicated to a single cryptocurrency like Bitcoin, Bitcoin Cash, Litecoin, and Dogecoin. Perfect for users focusing on one specific coin',
       ),
       cta: () => {
         dispatch(
@@ -69,41 +74,69 @@ const AddingOptions: React.FC = () => {
       id: 'account-based-wallet',
       title: t('Account-Based Wallet'),
       description: t(
-        'An account for Ethereum and EVM-compatible chains like Solana, Ethereum. Supports smart contracts and DeFi across multiple networks.',
+        'An account for Ethereum and EVM-compatible networks like Ethereum, Polygon, Base and more. This account type supports Smart Contracts, Dapps and DeFi',
       ),
       cta: async () => {
-        dispatch(
-          Analytics.track('Clicked Create Basic Wallet', {
-            context: 'AddingOptions',
-          }),
-        );
-        const _key = key.methods as KeyMethods;
-        await dispatch(startOnGoingProcessModal('ADDING_ACCOUNT'));
-        const wallets = await dispatch(
-          createMultipleWallets({
-            key: _key,
-            currencies: getBaseAccountCreationCoinsAndTokens(),
-            options: {
-              network,
-            },
-          }),
-        );
-        key.wallets.push(...(wallets as Wallet[]));
+        try {
+          dispatch(
+            Analytics.track('Clicked Create Basic Wallet', {
+              context: 'AddingOptions',
+            }),
+          );
+          const _key = key.methods as KeyMethods;
+          await dispatch(startOnGoingProcessModal('ADDING_ACCOUNT'));
+          const wallets = await dispatch(
+            createMultipleWallets({
+              key: _key,
+              currencies: getBaseAccountCreationCoinsAndTokens(),
+              options: {
+                network,
+              },
+            }),
+          );
+          key.wallets.push(...(wallets as Wallet[]));
 
-        dispatch(successAddWallet({key}));
-        dispatch(dismissOnGoingProcessModal());
-        navigation.goBack();
+          dispatch(successAddWallet({key}));
+          dispatch(dismissOnGoingProcessModal());
+          navigation.goBack();
+        } catch (err) {
+          const errstring =
+            err instanceof Error ? err.message : JSON.stringify(err);
+          dispatch(LogActions.error(`Error adding account: ${errstring}`));
+          dispatch(dismissOnGoingProcessModal());
+          await sleep(1000);
+          showErrorModal(errstring);
+        }
       },
     },
     {
       id: 'multisig-wallet',
       title: t('Multisig Wallet'),
       description: t(
-        'Requires multiple approvals for transactions for wallets like Bitcoin, Bitcoin Cash, Litecoin, and Dogecoin. Ideal for shared funds or enhanced security.',
+        'Requires multiple approvals for transactions for wallets like Bitcoin, Bitcoin Cash, Litecoin, and Dogecoin. Ideal for shared funds or enhanced security',
       ),
       cta: () => setShowMultisigOptions(true),
     },
   ];
+
+  const showErrorModal = (e: string) => {
+    dispatch(
+      showBottomNotificationModal({
+        type: 'warning',
+        title: t('Something went wrong'),
+        message: e,
+        enableBackdropDismiss: true,
+        actions: [
+          {
+            text: t('OK'),
+            action: () => {},
+            primary: true,
+          },
+        ],
+      }),
+    );
+  };
+
   return (
     <>
       <OptionContainer>

diff --git a/src/navigation/wallet/screens/CreationOptions.tsx b/src/navigation/wallet/screens/CreationOptions.tsx
@@ -27,6 +27,7 @@ import {
 } from '../../../store/app/app.actions';
 import {sleep} from '../../../utils/helper-methods';
 import {getBaseKeyCreationCoinsAndTokens} from '../../../constants/currencies';
+import {LogActions} from '../../../store/log';
 
 type CreationOptionsScreenProps = NativeStackScreenProps<
   WalletGroupParamList,
@@ -79,19 +80,21 @@ const CreationOptions: React.FC<CreationOptionsScreenProps> = ({
 
           navigation.navigate('BackupKey', {context, key: createdKey});
           dispatch(dismissOnGoingProcessModal());
-        } catch (e: any) {
-          logger.error(e.message);
+        } catch (err: any) {
+          const errstring =
+            err instanceof Error ? err.message : JSON.stringify(err);
+          dispatch(LogActions.error(`Error creating key: ${errstring}`));
           dispatch(dismissOnGoingProcessModal());
           await sleep(500);
-          showErrorModal(e.message);
+          showErrorModal(errstring);
         }
       },
     },
     {
       id: 'import',
       title: t('Import Key'),
       description: t(
-        'Recover an existing key by entering your 12-word passphrase to access your wallets and accounts.',
+        'Recover an existing key by entering your 12-word passphrase to access your wallets and accounts',
       ),
       cta: () => {
         dispatch(

diff --git a/src/navigation/wallet/screens/CurrencySelection.tsx b/src/navigation/wallet/screens/CurrencySelection.tsx
@@ -59,6 +59,7 @@ import SearchComponent, {
 } from '../../../components/chain-search/ChainSearch';
 import {ignoreGlobalListContextList} from '../../../components/modal/chain-selector/ChainSelector';
 import cloneDeep from 'lodash.clonedeep';
+import {LogActions} from '../../../store/log';
 
 type CurrencySelectionScreenProps = NativeStackScreenProps<
   WalletGroupParamList,
@@ -464,11 +465,13 @@ const CurrencySelection = ({route}: CurrencySelectionScreenProps) => {
                 }),
               );
               dispatch(dismissOnGoingProcessModal());
-            } catch (e: any) {
-              logger.error(e.message);
+            } catch (err: any) {
+              const errstring =
+                err instanceof Error ? err.message : JSON.stringify(err);
+              dispatch(LogActions.error(`Error creating key: ${errstring}`));
               dispatch(dismissOnGoingProcessModal());
               await sleep(500);
-              showErrorModal(e.message);
+              showErrorModal(errstring);
             }
           },
           selectedCurrencies,

diff --git a/src/store/wallet/effects/create/create.ts b/src/store/wallet/effects/create/create.ts
@@ -112,10 +112,7 @@ export const startCreateKey =
         );
         resolve(key);
       } catch (err) {
-        const errstring =
-          err instanceof Error ? err.message : JSON.stringify(err);
-        dispatch(LogActions.error(`Error creating key: ${errstring}`));
-        reject();
+        reject(err);
       }
     });
   };