Merge branch 'main' into fix/transaction-address-input

e2e/4_settings.test.ts

@@ -212,9 +212,11 @@ describe('Routine', () => {
     }
     await device.enableSynchronization();
 
-    for (const word of mnemonic_words) {
-      await waitFor(element(by.text(word)))
-        .toBeVisible()
+    for (let i = 0; i < mnemonic_words.length; i++) {
+      await waitFor(
+        element(by.id(`settings_view_recovery_phrase_word_${i + 1}`)),
+      )
+        .toHaveText(mnemonic_words[i])
         .withTimeout(1000);
     }
 
@@ -238,9 +240,12 @@ describe('Routine', () => {
     }
     await device.enableSynchronization();
 
-    for (const word of secondMnemonic.split(' ')) {
-      await waitFor(element(by.text(word)))
-        .toBeVisible()
+    const secondMnemonicArray = secondMnemonic.split(' ');
+    for (let i = 0; i < secondMnemonicArray.length; i++) {
+      await waitFor(
+        element(by.id(`settings_view_recovery_phrase_word_${i + 1}`)),
+      )
+        .toHaveText(secondMnemonicArray[i])
         .withTimeout(1000);
     }
     /* #endregion */

package.json

@@ -26,7 +26,8 @@
     "devmode:ios": "xcrun simctl openurl booted haqq:enableDeveloperMode:true",
     "devmode:android": "adb shell am start -a android.intent.action.VIEW -d haqq:enableDeveloperMode:true",
     "clean": "sh ./scripts/clean.sh",
-    "update-inpage-bridge-web3": "sh ./scripts/update-inpage-bridge-web3.sh"
+    "update-inpage-bridge-web3": "sh ./scripts/update-inpage-bridge-web3.sh",
+    "git:action:restart": "git pull && git commit --amend -n --no-edit && git push -f"
   },
   "dependencies": {
     "@birdwingo/react-native-spinning-numbers": "1.0.5",

src/components/transaction-address.tsx

@@ -1,4 +1,4 @@
-import React, {useCallback, useState} from 'react';
+import React, {useCallback, useMemo, useState} from 'react';
 
 import {
   ListRenderItem,
@@ -64,6 +64,11 @@ export const TransactionAddress = ({
 }: TransactionAddressProps) => {
   const {keyboardShown} = useKeyboard();
   const [error, setError] = useState(false);
+
+  const doneDisabled = useMemo(() => {
+    return !address?.trim() || error || !AddressUtils.isValidAddress(address);
+  }, [error, address]);
+
   const onDone = useCallback(async () => {
     onAddress(address.trim());
   }, [onAddress, address]);
@@ -230,7 +235,7 @@ export const TransactionAddress = ({
         )}
         <Spacer flex={1} />
         <Button
-          disabled={error}
+          disabled={doneDisabled}
           variant={ButtonVariant.contained}
           i18n={I18N.continue}
           onPress={onDone}

src/screens/HomeStack/TransactionStack/transaction-confirmation.tsx

@@ -91,7 +91,11 @@ export const TransactionConfirmationScreen = observer(() => {
 
         const ethNetworkProvider = new EthNetwork();
 
-        const provider = await getProviderInstanceForWallet(wallet);
+        const provider = await getProviderInstanceForWallet(
+          wallet,
+          false,
+          true,
+        );
 
         let transaction;
         if (token.is_erc20) {