From 4d154c98d477f31e29877ffd46e1659999542bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= <marcospr@pm.me>
Date: Fri, 1 Oct 2021 14:04:40 -0400
Subject: [PATCH] FIX: Android keyboard when entering mnemonic at import should
 not enforce number row

---
 ios/Podfile.lock              |  8 ++++----
 package-lock.json             |  6 +++---
 screen/wallets/import.js      | 36 ++++++++++++++++++++---------------
 tests/e2e/bluewallet2.spec.js |  1 -
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 1743dcc86..133a7d782 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -294,7 +294,7 @@ PODS:
     - React-Core
   - react-native-tor (0.1.7):
     - React
-  - react-native-webview (11.13.1):
+  - react-native-webview (11.14.0):
     - React-Core
   - react-native-widget-center (0.0.7):
     - React
@@ -387,7 +387,7 @@ PODS:
     - React
   - RNKeychain (7.0.0):
     - React-Core
-  - RNLocalize (2.1.4):
+  - RNLocalize (2.1.5):
     - React-Core
   - RNPrivacySnapshot (1.0.0):
     - React
@@ -749,7 +749,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: 5cf05f49df9d17261e40e518481f2e334c6cd4b5
   react-native-tcp-socket: 029f7bdaf113df22cbe07347cc65a19abaa9672d
   react-native-tor: 4f389f5719dad633542b57ea32744e954730e7ef
-  react-native-webview: cea67b82dd5fbdf0f5c821b4ca0ca0b01e954c0b
+  react-native-webview: a785c756d3968f09653b1c081e6f1cb9149a94ac
   react-native-widget-center: 5e63193fce272aa3c2aa4f1a33e129b06a962f47
   React-perflogger: 25373e382fed75ce768a443822f07098a15ab737
   React-RCTActionSheet: af7796ba49ffe4ca92e7277a5d992d37203f7da5
@@ -775,7 +775,7 @@ SPEC CHECKSUMS:
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNHandoff: d3b0754cca3a6bcd9b25f544f733f7f033ccf5fa
   RNKeychain: f75b8c8b2f17d3b2aa1f25b4a0ac5b83d947ff8f
-  RNLocalize: 8bc7ebf44e0f18898cc62f0061561d07fabf6ff9
+  RNLocalize: 13a971fd888f2933504a745983f781dc52feeab6
   RNPrivacySnapshot: 71919dde3c6a29dd332115409c2aec564afee8f4
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
   RNRate: 622db602051b6abf6ec467cdcc3c5e3112076745
diff --git a/package-lock.json b/package-lock.json
index 225bd76fe..e90112e51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20064,9 +20064,9 @@
       }
     },
     "react-native-webview": {
-      "version": "11.13.1",
-      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.13.1.tgz",
-      "integrity": "sha512-6/XXN79Bd6Cby+ZRD7gEeENu0an+EsZjBnTQg5FPW9GIlf5NCC/XM0dLwOl88kXKCRKnZjar2qj0CbF1E1gTEA==",
+      "version": "11.14.0",
+      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.14.0.tgz",
+      "integrity": "sha512-G5pIYL3dU4rWt4K8W8ZoEDHL3nCR+rnNWsrCP/rJcl1gElxZn2xlpHjNml4myopIzn835NgE0/dJJ9VHvdMg3Q==",
       "requires": {
         "escape-string-regexp": "2.0.0",
         "invariant": "2.2.4"
diff --git a/screen/wallets/import.js b/screen/wallets/import.js
index b2b0da75b..30c874983 100644
--- a/screen/wallets/import.js
+++ b/screen/wallets/import.js
@@ -110,21 +110,8 @@ const WalletsImport = () => {
     });
   };
 
-  return (
-    <SafeBlueArea style={styles.root}>
-      <BlueSpacing20 />
-      <TouchableWithoutFeedback onPress={speedBackdoorTap} testID="SpeedBackdoor">
-        <BlueFormLabel>{loc.wallets.import_explanation}</BlueFormLabel>
-      </TouchableWithoutFeedback>
-      <BlueSpacing20 />
-      <BlueFormMultiInput
-        value={importText}
-        contextMenuHidden={!isDesktop}
-        onChangeText={setImportText}
-        testID="MnemonicInput"
-        inputAccessoryViewID={BlueDoneAndDismissKeyboardInputAccessory.InputAccessoryViewID}
-      />
-
+  const renderOptionsAndImportButton = (
+    <>
       {isAdvancedModeEnabledRender && (
         <>
           <View style={styles.row}>
@@ -151,6 +138,25 @@ const WalletsImport = () => {
           <BlueButtonLink title={loc.wallets.import_scan_qr} onPress={importScan} testID="ScanImport" />
         </>
       </View>
+    </>
+  );
+
+  return (
+    <SafeBlueArea style={styles.root}>
+      <BlueSpacing20 />
+      <TouchableWithoutFeedback onPress={speedBackdoorTap} testID="SpeedBackdoor">
+        <BlueFormLabel>{loc.wallets.import_explanation}</BlueFormLabel>
+      </TouchableWithoutFeedback>
+      <BlueSpacing20 />
+      <BlueFormMultiInput
+        value={importText}
+        contextMenuHidden={!isDesktop}
+        onChangeText={setImportText}
+        testID="MnemonicInput"
+        inputAccessoryViewID={BlueDoneAndDismissKeyboardInputAccessory.InputAccessoryViewID}
+      />
+
+      {Platform.select({ android: !isToolbarVisibleForAndroid && renderOptionsAndImportButton, default: renderOptionsAndImportButton })}
       {Platform.select({
         ios: (
           <BlueDoneAndDismissKeyboardInputAccessory
diff --git a/tests/e2e/bluewallet2.spec.js b/tests/e2e/bluewallet2.spec.js
index 3e7a234cf..73a091327 100644
--- a/tests/e2e/bluewallet2.spec.js
+++ b/tests/e2e/bluewallet2.spec.js
@@ -30,7 +30,6 @@ afterAll(async () => {
 });
 
 describe('BlueWallet UI Tests - import BIP84 wallet', () => {
-
   it('can import BIP84 mnemonic, fetch balance & transactions, then create a transaction; then cosign', async () => {
     const lockFile = '/tmp/travislock.' + hashIt(jasmine.currentTest.fullName);
     if (process.env.TRAVIS) {