Wording changes, recovery fixes

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "net.mynero.wallet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 50100
+        versionCode 50200
-        versionName "0.5.1 'Fluorine Fermi'"
+        versionName "0.5.2 'Fluorine Fermi'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingFragment.kt

@@ -121,10 +121,12 @@ class OnboardingFragment : Fragment(), NodeSelectionDialogListener, AddNodeListe
                 seedOffsetCheckbox?.visibility = View.VISIBLE
                 walletRestoreHeightEditText?.visibility = View.VISIBLE
                 walletPasswordEditText?.hint = getString(R.string.password_optional)
+                walletSeedEditText?.hint = getString(R.string.recovery_phrase_optional_legacy)
             } else {
                 seedOffsetCheckbox?.visibility = View.GONE
                 walletRestoreHeightEditText?.visibility = View.GONE
                 walletPasswordEditText?.hint = getString(R.string.password_non_optional)
+                walletSeedEditText?.hint = getString(R.string.recovery_phrase_optional_polyseed)
             }
         }
     }

app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingViewModel.kt

@@ -93,8 +93,8 @@ class OnboardingViewModel : ViewModel() {
             if (offset.isNotEmpty()) {
                 PrefService.instance?.edit()?.putBoolean(Constants.PREF_USES_OFFSET, true)?.apply()
             }
+            val seedTypeValue = seedType.value ?: return@execute
             if (walletSeed.isEmpty()) {
-                val seedTypeValue = seedType.value ?: return@execute
                 if (seedTypeValue == SeedType.POLYSEED) {
                     wallet = if (offset.isEmpty()) {
                         mainActivity.runOnUiThread {
@@ -145,13 +145,22 @@ class OnboardingViewModel : ViewModel() {
                 if (restoreHeightText.isNotEmpty()) {
                     restoreHeight = restoreHeightText.toLong()
                 }
-                wallet = WalletManager.instance?.recoveryWallet(
+                if (seedTypeValue == SeedType.POLYSEED) {
-                    walletFile,
+                    wallet = WalletManager.instance?.recoveryWalletPolyseed(
-                    walletPassword,
+                        walletFile,
-                    walletSeed,
+                        walletPassword,
-                    offset,
+                        walletSeed,
-                    restoreHeight
+                        offset
-                )
+                    )
+                } else if (seedTypeValue == SeedType.LEGACY) {
+                    wallet = WalletManager.instance?.recoveryWallet(
+                        walletFile,
+                        walletPassword,
+                        walletSeed,
+                        offset,
+                        restoreHeight
+                    )
+                }
             }
             val walletStatus = wallet?.status
             wallet?.close()

app/src/main/res/layout/fragment_onboarding.xml

@@ -183,7 +183,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:background="@drawable/edittext_bg"
-                        android:hint="@string/recovery_phrase_optional"
+                        android:hint="@string/recovery_phrase_optional_polyseed"
                         android:minHeight="48dp"
                         app:layout_constraintBottom_toTopOf="@id/wallet_restore_height_edittext"
                         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/fragment_send.xml

@@ -214,6 +214,7 @@
             android:elevation="6dp"
             android:visibility="gone"
             android:importantForAccessibility="yes"
+            android:contentDescription="@string/slide_to_send_transaction"
             app:area_margin="10dp"
             app:border_radius="20dp"
             app:inner_color="@android:color/white"

app/src/main/res/layout/wallet_keys_bottom_sheet_dialog.xml

@@ -31,8 +31,8 @@
             android:id="@+id/wallet_seed_label_textview"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="32dp"
-            android:textSize="18sp"
+            android:textSize="24sp"
             android:textStyle="bold"
             android:text="@string/wallet_seed_label"
             app:layout_constraintEnd_toEndOf="parent"
@@ -81,8 +81,8 @@
             android:id="@+id/wallet_viewkey_label_textview"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="32dp"
-            android:textSize="18sp"
+            android:textSize="24sp"
             android:textStyle="bold"
             android:text="@string/wallet_viewkey_label"
             app:layout_constraintEnd_toEndOf="parent"
@@ -133,8 +133,8 @@
             android:id="@+id/wallet_restore_height_label_textview"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="16dp"
-            android:textSize="18sp"
+            android:textSize="24sp"
             android:textStyle="bold"
             android:text="@string/wallet_restore_height_label"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/values/strings.xml

@@ -48,10 +48,11 @@
     <string name="send_monero">Send</string>
     <string name="recv_monero">Receive</string>
     <string name="more_options">More options</string>
-    <string name="recovery_phrase_optional">Recovery phrase (optional)</string>
+    <string name="recovery_phrase_optional_legacy">Recovery seed (legacy)</string>
+    <string name="recovery_phrase_optional_polyseed">Recovery seed (polyseed)</string>
     <string name="restore_height_optional">Restore height (optional)</string>
     <string name="password_optional">Passphrase (optional)</string>
-    <string name="password_non_optional">Enter a passphrase</string>
+    <string name="password_non_optional">Passphrase (seed offset; required)</string>
     <string name="password_confirm">Confirm passphrase</string>
     <string name="password">Passphrase</string>
     <string name="label">Label</string>
@@ -125,9 +126,9 @@
     <string name="cant_edit_current_node">Cannot edit current node.</string>
     <string name="cant_edit_default_nodes">Cannot edit default node.</string>
     <string name="edit_node">Edit Node</string>
-    <string name="wallet_seed_label">Recovery phrase</string>
+    <string name="wallet_seed_label">Recovery seed</string>
-    <string name="wallet_seed_desc">Anyone with your recovery phrase can spend ALL coins in this wallet!</string>
+    <string name="wallet_seed_desc">Anyone with your recovery seed can spend ALL coins in this wallet!</string>
-    <string name="wallet_seed_offset_desc">Your wallet seed offset (sometimes called a seed passphrase) is the passphrase you use to unlock the wallet in this app. It will not be displayed here, but it is needed to FULLY restore the keys to this wallet.</string>
+    <string name="wallet_seed_offset_desc">Your wallet seed passphrase (sometimes called a seed offset) is the passphrase you use to unlock the wallet in this app. It will not be displayed here, but it is needed to FULLY restore the keys to this wallet.</string>
     <string name="wallet_viewkey_label">Private view-key</string>
     <string name="wallet_viewkey_desc">Anyone with your private view-key can see all incoming transactions!</string>
     <string name="wallet_restore_height_label">Restore height</string>
@@ -157,5 +158,6 @@
     <string name="seed_desc_legacy">Older, 25 word seed; supported in all Monero wallets. In Mysu, seed passphrase is not enforced for these wallets.</string>
     <string name="approve_the_transaction">Send transaction</string>
     <string name="paste_clipboard_into_passphrase_field">Paste clipboard into passphrase field</string>
+    <string name="slide_to_send_transaction">Slide to send transaction</string>
 
 </resources>