EdgeApp · j0ntz · Aug 17, 2026 · Aug 17, 2026 · Aug 31, 2026
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - fixed: Notification center cards no longer shrink their text to fit. Long titles and messages now truncate with an ellipsis so every card renders at the same size.
 - fixed: Sort the Privacy Settings Nym Mix Net asset list alphabetically by display name
 - fixed: Next button overlapping the wallet list on the Choose Wallets to Add scene
+- fixed: Keyboard no longer covers the Next button on the Import Wallet scene. The scene ends flush against the keyboard instead of leaving a band of dead space the content cannot scroll into, its spacing no longer stretches or compresses with the length of the seed phrase, and the button sits just above the keyboard rather than 3 rem clear of it.
 - fixed: Wrap the fiat value in parentheses on the Stake/Unstake/Claim amount row, and remove the space between the fiat symbol and amount to match the network fee tile.
 - fixed: Staked "locked" balance in the wallet view no longer gets cut off. The crypto amount is truncated to an exchange-rate-appropriate number of decimals, and the text is no longer clamped to a fraction of the card width.
 - fixed: Improve the unstake error experience by replacing the popup alert and generic "unknown error occurred" with the real error in the scene's error field, and showing a clear message when the wallet lacks the balance to cover the unstaking network fee.

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -137,13 +137,12 @@ export default [
       'src/actions/WalletListActions.tsx',
 
       'src/app.ts',
-      'src/components/buttons/ButtonsView.tsx',
+
       'src/components/buttons/EdgeSwitch.tsx',
       'src/components/buttons/IconButton.tsx',
       'src/components/buttons/MinimalButton.tsx',
       'src/components/buttons/ModalButtons.tsx',
       'src/components/buttons/ReturnKeyTypeButton.tsx',
-      'src/components/buttons/SceneButtons.tsx',
 
       'src/components/cards/BalanceCard.tsx',
       'src/components/cards/EarnOptionCard.tsx',

diff --git a/maestro/07-wallets/C000029a-migrate-wallets.yaml b/maestro/07-wallets/C000029a-migrate-wallets.yaml
@@ -96,20 +96,14 @@ tags:
 - tapOn: Private Key or Private Seed
 - inputText: ${IMPORT_SEED}
 
-# Drop keyboard - Android
-- runFlow:
-    when:
-      platform: Android
-    commands:
-        - hideKeyboard
-        # - tapOn: Next # odd additional tap required on android sometimes
-# Drop keyboard - iOS
-- runFlow:
-    when:
-      platform: iOS
-    commands:
-        - tapOn: "Private Key or Private Seed"
-
+# The Import Wallet scene keeps Next clear of the keyboard on both platforms, so
+# neither one drops the keyboard to reach it. A long phrase can still push Next
+# past the bottom of the scroll viewport, which the scene scrolls to reveal.
+- scrollUntilVisible:
+    element:
+      text: Next
+    direction: DOWN
+    timeout: 20000
 - tapOn: Next
 
 # Sometimes android requires additional tap

diff --git a/maestro/common/import-wallets.yaml b/maestro/common/import-wallets.yaml
@@ -39,29 +39,16 @@ env:
 - tapOn: Private Key or Private Seed
 - inputText: ${SEED_PHRASE}
 
-# Drop keyboard - Android
-- runFlow:
-    when:
-      platform: Android
-    commands:
-        - hideKeyboard
-        - tapOn: "Enter your.*"
-# Drop keyboard - iOS
-- runFlow:
-    when:
-      platform: iOS
-    commands:
-        - tapOn: "Private Key or Private Seed"
-
+# The Import Wallet scene keeps Next clear of the keyboard on both platforms, so
+# neither one drops the keyboard to reach it. A long phrase can still push Next
+# past the bottom of the scroll viewport, which the scene scrolls to reveal.
+- scrollUntilVisible:
+    element:
+      text: Next
+    direction: DOWN
+    timeout: 20000
 - tapOn: Next
 
-# # Sometimes android requires additional tap
-# - runFlow:
-#     when:
-#       visible: Import Wallet
-#     commands:
-#       - tapOn: Next
-
 # Add birthday height for Zcash and Pirate Chain
 # Index for targetting the correct "edit" icon 
 - evalScript: ${var index = 0}

diff --git a/src/__tests__/components/__snapshots__/BalanceCard.test.tsx.snap b/src/__tests__/components/__snapshots__/BalanceCard.test.tsx.snap
@@ -1505,6 +1505,7 @@ exports[`BalanceCard should render with loading props 1`] = `
   </View>
   <View
     absolute={false}
+    keyboardOpen={false}
     layout="row"
     style={
       {

diff --git a/src/__tests__/components/__snapshots__/Buttons.test.tsx.snap b/src/__tests__/components/__snapshots__/Buttons.test.tsx.snap
@@ -10,6 +10,7 @@ exports[`Buttons should render in a ButtonsView in a column layout in a flex:1 V
 >
   <View
     absolute={false}
+    keyboardOpen={false}
     layout="column"
     style={
       {
@@ -437,6 +438,7 @@ exports[`Buttons should render in a ButtonsView in a column layout in a flex:1 V
   </View>
   <View
     absolute={false}
+    keyboardOpen={false}
     layout="column"
     style={
       {
@@ -592,6 +594,7 @@ exports[`Buttons should render in a ButtonsView in a column layout in a flex:1 V
 exports[`Buttons should render in a ButtonsView in a column layout with 1 buttons 1`] = `
 <View
   absolute={false}
+  keyboardOpen={false}
   layout="column"
   style={
     {
@@ -899,6 +902,7 @@ exports[`Buttons should render in a ButtonsView in a column layout with 1 button
 exports[`Buttons should render in a ButtonsView in a column layout with 2 buttons 1`] = `
 <View
   absolute={false}
+  keyboardOpen={false}
   layout="column"
   style={
     {
@@ -1206,6 +1210,7 @@ exports[`Buttons should render in a ButtonsView in a column layout with 2 button
 exports[`Buttons should render in a ButtonsView in a column layout with 3 buttons 1`] = `
 <View
   absolute={false}
+  keyboardOpen={false}
   layout="column"
   style={
     {
@@ -1643,6 +1648,7 @@ exports[`Buttons should render in a ButtonsView in a row layout in a flex:1 View
 >
   <View
     absolute={false}
+    keyboardOpen={false}
     layout="row"
     style={
       {
@@ -2057,6 +2063,7 @@ exports[`Buttons should render in a ButtonsView in a row layout in a flex:1 View
   </View>
   <View
     absolute={false}
+    keyboardOpen={false}
     layout="row"
     style={
       {
@@ -2210,6 +2217,7 @@ exports[`Buttons should render in a ButtonsView in a row layout in a flex:1 View
 exports[`Buttons should render in a ButtonsView in a row layout with 1 buttons 1`] = `
 <View
   absolute={false}
+  keyboardOpen={false}
   layout="row"
   style={
     {
@@ -2510,6 +2518,7 @@ exports[`Buttons should render in a ButtonsView in a row layout with 1 buttons 1
 exports[`Buttons should render in a ButtonsView in a row layout with 2 buttons 1`] = `
 <View
   absolute={false}
+  keyboardOpen={false}
   layout="row"
   style={
     {
@@ -2810,6 +2819,7 @@ exports[`Buttons should render in a ButtonsView in a row layout with 2 buttons 1
 exports[`Buttons should render in a ButtonsView in a row layout with 3 buttons 1`] = `
 <View
   absolute={false}
+  keyboardOpen={false}
   layout="row"
   style={
     {

diff --git a/src/__tests__/modals/__snapshots__/AutoLogoutModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/AutoLogoutModal.test.tsx.snap
@@ -729,6 +729,7 @@ exports[`AutoLogoutModal should render with loading props 1`] = `
     </View>
     <View
       absolute={false}
+      keyboardOpen={false}
       layout="column"
       parentType="modal"
       style={

diff --git a/src/__tests__/modals/__snapshots__/LogsModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/LogsModal.test.tsx.snap
@@ -1020,6 +1020,7 @@ exports[`LogsModal should render with a logs modal 1`] = `
         </View>
         <View
           absolute={false}
+          keyboardOpen={false}
           layout="column"
           parentType="modal"
           style={

diff --git a/src/__tests__/modals/__snapshots__/PasswordReminderModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/PasswordReminderModal.test.tsx.snap
@@ -888,6 +888,7 @@ Please enter your password below. A successful verification will prevent this wa
     </View>
     <View
       absolute={false}
+      keyboardOpen={false}
       layout="column"
       parentType="modal"
       style={

diff --git a/src/__tests__/modals/__snapshots__/TextInputModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/TextInputModal.test.tsx.snap
@@ -697,6 +697,7 @@ exports[`TextInputModal should render with a blank input field 1`] = `
       </View>
       <View
         absolute={false}
+        keyboardOpen={false}
         layout="column"
         parentType="modal"
         style={
@@ -1551,6 +1552,7 @@ exports[`TextInputModal should render with a populated input field 1`] = `
       </View>
       <View
         absolute={false}
+        keyboardOpen={false}
         layout="column"
         parentType="modal"
         style={

diff --git a/src/__tests__/scenes/__snapshots__/CreateWalletEditNameScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/CreateWalletEditNameScene.test.tsx.snap
@@ -1004,6 +1004,7 @@ exports[`CreateWalletEditNameComponent should render with loading props 1`] = `
     </RCTScrollView>
     <View
       absolute={false}
+      keyboardOpen={false}
       layout="column"
       style={
         {
-Original file line number
+Diff line change
@@ Expand Up @@
       </View>
       <View
         absolute={false}
+        keyboardOpen={false}
         layout="row"
         style={
           {
@@ Expand Down @@