Merge remote-tracking branch 'origin/release/wallet-mobile/v4.27.0' i…

…nto fix/setup-wallet/info-icon-alignment
Emurgo · May 7, 2024 · 408b253 · 408b253
2 parents f557de0 + d65b2f4
commit 408b253
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 50 deletions.
diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle
@@ -108,7 +108,7 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 669
+        versionCode 670
         versionName "4.27.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>556</string>
+	<string>557</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -839,7 +839,7 @@
 				CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 556;
+				CURRENT_PROJECT_VERSION = 557;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -884,7 +884,7 @@
 				CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 556;
+				CURRENT_PROJECT_VERSION = 557;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.production";
@@ -1079,7 +1079,7 @@
 				CODE_SIGN_ENTITLEMENTS = nightly.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 556;
+				CURRENT_PROJECT_VERSION = 557;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1124,7 +1124,7 @@
 				CODE_SIGN_ENTITLEMENTS = nightly.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 556;
+				CURRENT_PROJECT_VERSION = 557;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";

diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>556</string>
+	<string>557</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>556</string>
+	<string>557</string>
 </dict>
 </plist>
diff --git a/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx b/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx
@@ -342,7 +342,7 @@ export const messages = Object.freeze(
     },
     walletDetailsPasswordHelper: {
       id: 'components.walletinit.walletDetails.walletDetailsPasswordHelper',
-      defaultMessage: '!!!Combine of letters, numbers and symbols to make it stronger',
+      defaultMessage: '!!!Combine letters, numbers and symbols to make it stronger',
     },
     walletDetailsNameInput: {
       id: 'components.walletinit.walletDetails.walletDetailsNameInput',

diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
@@ -334,6 +334,7 @@ export const WalletDetailsScreen = () => {
             autoComplete="off"
             disabled={isLoading}
             showErrorOnBlur
+            textContentType="oneTimeCode"
           />
 
           <Space height="xl" />
@@ -351,6 +352,7 @@ export const WalletDetailsScreen = () => {
             autoComplete="off"
             disabled={isLoading}
             showErrorOnBlur
+            textContentType="oneTimeCode"
           />
 
           <Space height="xl" />

diff --git a/...let-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx b/...let-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
@@ -288,6 +288,7 @@ export const RestoreWalletDetailsScreen = () => {
             autoComplete="off"
             disabled={isLoading}
             showErrorOnBlur
+            textContentType="oneTimeCode"
           />
 
           <Space height="xl" />
@@ -305,6 +306,7 @@ export const RestoreWalletDetailsScreen = () => {
             autoComplete="off"
             disabled={isLoading}
             showErrorOnBlur={!isOpenWalletSuccess}
+            textContentType="oneTimeCode"
           />
 
           <Space height="xl" />

diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -544,7 +544,7 @@
   "components.walletinit.walletDetails.walletChecksumModalCardItem.third": "Checksum and plate number are unique to your wallet and represent your public key.",
   "components.walletinit.walletDetails.stepWalletDetails": "Wallet details",
   "components.walletinit.walletDetails.walletDetailsTitle": "<b>Add</b> your <b>wallet name</b> and <b>password</b>. ",
-  "components.walletinit.walletDetails.walletDetailsPasswordHelper": "Combine of letters, numbers and symbols to make it stronger",
+  "components.walletinit.walletDetails.walletDetailsPasswordHelper": "Combine letters, numbers and symbols to make it stronger",
   "components.walletinit.walletDetails.walletDetailsNameInput": "Enter wallet name",
   "components.walletinit.walletDetails.walletDetailsPasswordInput": "Enter password",
   "components.walletinit.walletDetails.walletDetailsConfirmPasswordInput": "Confirm password",