From 55fedabbff9cbe5e20456c0619695b6400cd5043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Abadesso?= <andre.abadesso@gmail.com>
Date: Sat, 9 Nov 2024 14:37:03 -0300
Subject: [PATCH 1/6] chore: bumped to v0.30.0-rc.1

---
 android/app/build.gradle                   | 2 +-
 ios/HathorMobile.xcodeproj/project.pbxproj | 8 ++++----
 package-lock.json                          | 4 ++--
 package.json                               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8abb0d261..8d6153164 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -80,7 +80,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 81
-        versionName "0.29.0"
+        versionName "0.30.0-rc.1"
         missingDimensionStrategy "react-native-camera", "general"
     }
     signingConfigs {
diff --git a/ios/HathorMobile.xcodeproj/project.pbxproj b/ios/HathorMobile.xcodeproj/project.pbxproj
index 4ccd7e3cc..bf4ed8a6d 100644
--- a/ios/HathorMobile.xcodeproj/project.pbxproj
+++ b/ios/HathorMobile.xcodeproj/project.pbxproj
@@ -476,7 +476,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 1.0.0;
+				CURRENT_PROJECT_VERSION = 0.1.0;
 				DEVELOPMENT_TEAM = 55SHY647CG;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = HathorMobile/Info.plist;
@@ -485,7 +485,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.29.0;
+				MARKETING_VERSION = 0.30.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -506,7 +506,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 1.0.0;
+				CURRENT_PROJECT_VERSION = 0.1.0;
 				DEVELOPMENT_TEAM = 55SHY647CG;
 				INFOPLIST_FILE = HathorMobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@@ -514,7 +514,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.29.0;
+				MARKETING_VERSION = 0.30.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package-lock.json b/package-lock.json
index 27669b99e..2a9597f57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "HathorMobile",
-  "version": "0.29.0",
+  "version": "0.30.0-rc.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "HathorMobile",
-      "version": "0.29.0",
+      "version": "0.30.0-rc.1",
       "dependencies": {
         "@ethersproject/shims": "5.7.0",
         "@fortawesome/fontawesome-svg-core": "1.2.36",
diff --git a/package.json b/package.json
index ee21b7071..d19b5aafc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "HathorMobile",
-  "version": "0.29.0",
+  "version": "0.30.0-rc.1",
   "engines": {
     "node": ">=18.0.0",
     "npm": ">=9.0.0"

From 6cc8af709bdb86c4e763bbabcb12096981be6442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Abadesso?= <andre.abadesso@gmail.com>
Date: Sat, 9 Nov 2024 18:33:25 -0300
Subject: [PATCH 2/6] fix: button font size (#622)

* fix: button cutting off text

* fix: simplebutton cutting off text
---
 src/components/NewHathorButton.js      | 34 +++++++++------
 src/components/Reown/WarnDisclaimer.js |  8 +++-
 src/components/SimpleButton.js         | 57 ++++++++++++++++++--------
 3 files changed, 68 insertions(+), 31 deletions(-)

diff --git a/src/components/NewHathorButton.js b/src/components/NewHathorButton.js
index 9d6d46080..7e073ea4e 100644
--- a/src/components/NewHathorButton.js
+++ b/src/components/NewHathorButton.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {
-  StyleSheet, Text, TouchableOpacity, View,
+  StyleSheet, Text, TouchableOpacity
 } from 'react-native';
 import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import { COLORS } from '../styles/themes';
@@ -45,11 +45,23 @@ const NewHathorButton = (props) => {
   }
 
   return (
-    <View style={[...wrapperViewStyle, props.wrapperStyle, props.style]}>
-      <TouchableOpacity onPress={props.onPress} style={style.touchable} disabled={props.disabled}>
-        <Text style={[...textStyle, props.textStyle]}>{props.title}</Text>
-      </TouchableOpacity>
-    </View>
+    <TouchableOpacity
+      onPress={props.onPress}
+      disabled={props.disabled}
+      style={[
+        ...wrapperViewStyle,
+        props.wrapperStyle,
+        props.style
+      ]}
+    >
+      <Text
+        numberOfLines={1}
+        adjustsFontSizeToFit
+        style={[...textStyle, props.textStyle]}
+      >
+        {props.title}
+      </Text>
+    </TouchableOpacity>
   );
 };
 
@@ -77,7 +89,9 @@ const style = StyleSheet.create({
     borderRadius: 8,
     backgroundColor: COLORS.textColor,
     alignSelf: 'stretch',
-    padding: 16,
+    paddingHorizontal: 16,
+    justifyContent: 'center',
+    alignItems: 'center',
   },
   wrapperDisabled: {
     backgroundColor: COLORS.textColorShadowOpacity005,
@@ -98,12 +112,6 @@ const style = StyleSheet.create({
   wrapperSecondaryDanger: {
     borderColor: COLORS.errorBgColor,
   },
-  touchable: {
-    flex: 1,
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
   text: {
     fontWeight: 'bold',
     fontSize: 14,
diff --git a/src/components/Reown/WarnDisclaimer.js b/src/components/Reown/WarnDisclaimer.js
index 396082cbd..888db3c63 100644
--- a/src/components/Reown/WarnDisclaimer.js
+++ b/src/components/Reown/WarnDisclaimer.js
@@ -71,13 +71,17 @@ const styles = StyleSheet.create({
     marginRight: 'auto',
   },
   learnMoreContainer: {
-    justifyContent: 'flex-start',
-    borderBottomWidth: 1,
+    minHeight: 'auto',
+    padding: 0,
+    paddingHorizontal: 0,
+    alignItems: 'flex-start',
   },
   learnMoreText: {
     fontSize: 12,
     lineHeight: 16,
     fontWeight: 'bold',
     color: 'hsla(0, 0%, 25%, 1)',
+    textAlign: 'left',
+    textDecorationLine: 'underline',
   },
 });
diff --git a/src/components/SimpleButton.js b/src/components/SimpleButton.js
index c7adc79f1..41a1f6e7e 100644
--- a/src/components/SimpleButton.js
+++ b/src/components/SimpleButton.js
@@ -4,13 +4,11 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
 import React from 'react';
 import {
   Image, StyleSheet, Text, TouchableOpacity, View,
 } from 'react-native';
 import { PRIMARY_COLOR } from '../constants';
-
 /**
  * Simple button component.
  *
@@ -28,7 +26,7 @@ import { PRIMARY_COLOR } from '../constants';
  */
 const SimpleButton = ({
   title,
-  textStyle,
+  textStyle = {},
   color,
   icon,
   iconStyle,
@@ -42,41 +40,62 @@ const SimpleButton = ({
       if (color) {
         textStyles.push({ color });
       }
-      return <Text style={textStyles}>{title}</Text>;
+      return (
+        <Text
+          numberOfLines={1}
+          adjustsFontSizeToFit
+          style={textStyles}
+        >
+          {title}
+        </Text>
+      );
     }
-
     return null;
   };
-
   const renderIcon = () => {
     if (icon) {
       return (
-        <View style={[styles.icon, iconStyle]}>
-          <Image source={icon} />
+        <View style={[styles.icon, title ? styles.iconWithTitle : null, iconStyle]}>
+          <Image
+            source={icon}
+            resizeMode='contain'
+            style={styles.iconImage}
+          />
         </View>
       );
     }
-
     return null;
   };
-
   return (
-    <TouchableOpacity onPress={onPress} style={[styles.container, containerStyle]}>
-      {renderTitle()}
-      {renderIcon()}
-      {children}
+    <TouchableOpacity
+      onPress={onPress}
+      style={[styles.container, containerStyle]}
+    >
+      <View style={styles.contentContainer}>
+        {renderTitle()}
+        {renderIcon()}
+        {children}
+      </View>
     </TouchableOpacity>
   );
 };
-
 const styles = StyleSheet.create({
   container: {
+    minHeight: 48,
+    justifyContent: 'center',
+    alignItems: 'center',
+    paddingHorizontal: 16,
+  },
+  contentContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
     justifyContent: 'center',
   },
   text: {
     fontSize: 14,
     lineHeight: 24,
     color: PRIMARY_COLOR,
+    textAlign: 'center',
   },
   icon: {
     justifyContent: 'center',
@@ -84,6 +103,12 @@ const styles = StyleSheet.create({
     width: 24,
     height: 24,
   },
+  iconWithTitle: {
+    marginLeft: 8,
+  },
+  iconImage: {
+    width: '100%',
+    height: '100%',
+  },
 });
-
 export default SimpleButton;

From 925bb2ed45a5d215db8a3fc9e571d8e9d254c65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Abadesso?= <andre.abadesso@gmail.com>
Date: Sat, 9 Nov 2024 18:40:11 -0300
Subject: [PATCH 3/6] chore: bumped to v0.30.0-rc.2 (#623)

---
 android/app/build.gradle                   | 4 ++--
 ios/HathorMobile.xcodeproj/project.pbxproj | 4 ++--
 package-lock.json                          | 4 ++--
 package.json                               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8d6153164..e6bd58328 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -79,8 +79,8 @@ android {
         applicationId "network.hathor.wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 81
-        versionName "0.30.0-rc.1"
+        versionCode 82
+        versionName "0.30.0-rc.2"
         missingDimensionStrategy "react-native-camera", "general"
     }
     signingConfigs {
diff --git a/ios/HathorMobile.xcodeproj/project.pbxproj b/ios/HathorMobile.xcodeproj/project.pbxproj
index bf4ed8a6d..c20370fc4 100644
--- a/ios/HathorMobile.xcodeproj/project.pbxproj
+++ b/ios/HathorMobile.xcodeproj/project.pbxproj
@@ -476,7 +476,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 0.1.0;
+				CURRENT_PROJECT_VERSION = 0.2.0;
 				DEVELOPMENT_TEAM = 55SHY647CG;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = HathorMobile/Info.plist;
@@ -506,7 +506,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 0.1.0;
+				CURRENT_PROJECT_VERSION = 0.2.0;
 				DEVELOPMENT_TEAM = 55SHY647CG;
 				INFOPLIST_FILE = HathorMobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
diff --git a/package-lock.json b/package-lock.json
index 2a9597f57..83a53b3dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "HathorMobile",
-  "version": "0.30.0-rc.1",
+  "version": "0.30.0-rc.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "HathorMobile",
-      "version": "0.30.0-rc.1",
+      "version": "0.30.0-rc.2",
       "dependencies": {
         "@ethersproject/shims": "5.7.0",
         "@fortawesome/fontawesome-svg-core": "1.2.36",
diff --git a/package.json b/package.json
index d19b5aafc..b7e3abc8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "HathorMobile",
-  "version": "0.30.0-rc.1",
+  "version": "0.30.0-rc.2",
   "engines": {
     "node": ">=18.0.0",
     "npm": ">=9.0.0"

From 8fc240167f48829d000600d4c3bce09dde5ed68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Abadesso?= <andre.abadesso@gmail.com>
Date: Sun, 10 Nov 2024 11:30:44 -0300
Subject: [PATCH 4/6] fix: updated register button to fit in the register nano
 contract screen (#624)

---
 locale/da/texts.po                            | 100 ++++++++---------
 locale/pt-br/texts.po                         | 105 +++++++++---------
 locale/ru-ru/texts.po                         | 100 ++++++++---------
 locale/texts.pot                              | 104 ++++++++---------
 src/components/SimpleButton.js                |   1 +
 .../NanoContractRegisterQrCodeScreen.js       |   4 +-
 6 files changed, 207 insertions(+), 207 deletions(-)

diff --git a/locale/da/texts.po b/locale/da/texts.po
index 011722700..70359a8a6 100644
--- a/locale/da/texts.po
+++ b/locale/da/texts.po
@@ -57,11 +57,11 @@ msgid "[Last] dddd [•] HH:mm"
 msgstr "[Sidste] dddd [•] HH:mm"
 
 #.  See https://momentjs.com/docs/#/displaying/calendar-time/
-#: src/models.js:107 src/utils.js:546
+#: src/models.js:107 src/utils.js:553
 msgid "DD MMM YYYY [•] HH:mm"
 msgstr "DD MMM YYYY [•] HH:mm"
 
-#: src/utils.js:220
+#: src/utils.js:227
 msgid "Invalid address"
 msgstr "Ugyldig adresse"
 
@@ -441,7 +441,7 @@ msgstr "Indtast dine seed-ord adskilt med mellemrum"
 #: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:358
 #: src/screens/LoadHistoryScreen.js:51 src/screens/LoadWalletErrorScreen.js:20
 #: src/screens/NanoContract/NanoContractRegisterScreen.js:168
-#: src/screens/PinScreen.js:274
+#: src/screens/PinScreen.js:285
 msgid "Try again"
 msgstr ""
 
@@ -463,49 +463,50 @@ msgstr "**${ props.loadedData.addresses } adresser** fundet"
 msgid "There's been an error connecting to the server."
 msgstr ""
 
-#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:303
-#: src/screens/Settings.js:161
+#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:314
+#: src/screens/Settings.js:162
 msgid "Reset wallet"
 msgstr "Nulstil wallet"
 
-#: src/screens/MainScreen.js:126
+#: src/screens/MainScreen.js:127
 msgid "No transactions"
 msgstr "Ingen transaktioner"
 
-#: src/screens/MainScreen.js:129
+#: src/screens/MainScreen.js:130
 msgid "|share:Share your address| with friends and start exchanging tokens"
 msgstr "|share:Del din adresse| med venner og begynd at udveksle tokens"
 
-#: src/screens/MainScreen.js:146
+#: src/screens/MainScreen.js:147
 msgid "Loading transactions"
 msgstr "Indlæser dine transaktioner"
 
-#: src/screens/MainScreen.js:155
+#: src/screens/MainScreen.js:156
 msgid "There was an error loading your transaction history"
 msgstr ""
 
-#: src/screens/MainScreen.js:158
+#: src/screens/MainScreen.js:159
 msgid "Please |tryAgain:try again|"
 msgstr ""
 
-#: src/screens/MainScreen.js:535 src/screens/MainScreen.js:567
+#: src/screens/MainScreen.js:536 src/screens/MainScreen.js:568
 msgid "Available Balance"
 msgstr "Tilgængelig saldo"
 
-#: src/screens/MainScreen.js:544
+#: src/screens/MainScreen.js:545
 msgid "Locked"
 msgstr "Låst"
 
 #.  translator: Used when the QR Code Scanner is opened, and user will manually
 #.  enter the information.
 #: src/screens/NanoContractRegisterQrCodeScreen.js:26
-#: src/screens/RegisterToken.js:27 src/screens/SendScanQRCode.js:87
-msgid "Manual info"
-msgstr "Manuel information"
+#: src/screens/Reown/ReownScan.js:41
+msgid "Manual"
+msgstr ""
 
-#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
+#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
+#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
 #: src/screens/NanoContractRegisterQrCodeScreen.js:48
-msgid "Nano Contract Registration"
+msgid "Register Nano Contract"
 msgstr ""
 
 #: src/screens/NanoContractRegisterQrCodeScreen.js:63
@@ -546,31 +547,31 @@ msgstr "Modtaget"
 msgid "Waiting confirmation"
 msgstr "Venter på bekræftelse"
 
-#: src/screens/PinScreen.js:263
+#: src/screens/PinScreen.js:274
 msgid "Incorrect PIN Code. Try again."
 msgstr "Forkert PIN-kode. Prøv igen."
 
-#: src/screens/PinScreen.js:74
+#: src/screens/PinScreen.js:77
 msgid "Enter your PIN Code "
 msgstr "Indtast din pinkode "
 
-#: src/screens/PinScreen.js:75
+#: src/screens/PinScreen.js:78
 msgid "Unlock Hathor Wallet"
 msgstr "Lås Hathor-wallet op"
 
 #: src/components/Reown/CreateTokenModal.js:60
 #: src/components/Reown/NanoContract/NewNanoContractTransactionModal.js:65
 #: src/components/Reown/NanoContract/SignOracleDataModal.js:79
-#: src/components/Reown/SignMessageModal.js:79 src/screens/PinScreen.js:300
+#: src/components/Reown/SignMessageModal.js:79 src/screens/PinScreen.js:311
 #: src/screens/Reown/ReownList.js:125
 msgid "Cancel"
 msgstr "Annuller"
 
-#: src/screens/PinScreen.js:334 src/screens/PinScreen.js:338
+#: src/screens/PinScreen.js:345 src/screens/PinScreen.js:349
 msgid "Biometry failed or canceled."
 msgstr "Biometri mislykkedes eller blev annulleret."
 
-#: src/screens/PushNotification.js:58 src/screens/Settings.js:135
+#: src/screens/PushNotification.js:58 src/screens/Settings.js:136
 msgid "Push Notification"
 msgstr ""
 
@@ -603,6 +604,12 @@ msgstr "Betalingsanmodning"
 msgid "RECEIVE"
 msgstr "MODTAG"
 
+#.  translator: Used when the QR Code Scanner is opened, and user will manually
+#.  enter the information.
+#: src/screens/RegisterToken.js:27 src/screens/SendScanQRCode.js:87
+msgid "Manual info"
+msgstr "Manuel information"
+
 #: src/screens/RegisterToken.js:42 src/screens/RegisterTokenManual.js:126
 msgid "REGISTER TOKEN"
 msgstr "REGISTRER TOKEN"
@@ -662,36 +669,36 @@ msgstr ""
 msgid "Reset Wallet"
 msgstr "Nulstil wallet"
 
-#: src/screens/Security.js:130
+#: src/screens/Security.js:131
 msgid "Disable biometry"
 msgstr "Deaktiver biometri"
 
-#: src/screens/Security.js:131
+#: src/screens/Security.js:132
 msgid "Disabling biometry"
 msgstr "Deaktiverer biometri"
 
-#: src/screens/Security.js:143
+#: src/screens/Security.js:144
 msgid "Enter your 6-digit pin to enable biometry"
 msgstr "Indtast din 6-cifrede pin for at aktivere biometri"
 
-#: src/screens/Security.js:154
+#: src/screens/Security.js:155
 msgid "No biometry supported"
 msgstr "Ingen biometri understøttet"
 
-#: src/screens/Security.js:154
+#: src/screens/Security.js:155
 #, javascript-format
 msgid "Use ${ this.supportedBiometry }"
 msgstr "Brug ${ this.supportedBiometry }"
 
-#: src/screens/Security.js:159
+#: src/screens/Security.js:160
 msgid "SECURITY"
 msgstr "SIKKERHED"
 
-#: src/screens/Security.js:183
+#: src/screens/Security.js:184
 msgid "Change PIN"
 msgstr "Skift pinkode"
 
-#: src/screens/Security.js:188
+#: src/screens/Security.js:189
 msgid "Lock wallet"
 msgstr "Lås wallet"
 
@@ -764,43 +771,43 @@ msgstr "Du har ikke den anmodede token [${ tokenLabel }]"
 msgid "Scan the QR code"
 msgstr "Scan QR-koden"
 
-#: src/screens/Settings.js:104
+#: src/screens/Settings.js:105
 msgid "You are connected to"
 msgstr "Du er tilsluttet til"
 
-#: src/screens/Settings.js:112
+#: src/screens/Settings.js:113
 msgid "General Settings"
 msgstr ""
 
-#: src/screens/Settings.js:116
+#: src/screens/Settings.js:117
 msgid "Connected to"
 msgstr "Forbundet til"
 
-#: src/screens/Settings.js:129
+#: src/screens/Settings.js:130
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: src/screens/Settings.js:142
+#: src/screens/Settings.js:143
 msgid "Create a new token"
 msgstr "Opret en ny token"
 
-#: src/screens/Settings.js:149
+#: src/screens/Settings.js:150
 msgid "Register a token"
 msgstr "Registrer en token"
 
-#: src/screens/Settings.js:165
+#: src/screens/Settings.js:166
 msgid "About"
 msgstr "Om"
 
-#: src/screens/Settings.js:172
+#: src/screens/Settings.js:173
 msgid "Unique app identifier"
 msgstr ""
 
-#: src/screens/Settings.js:186
+#: src/screens/Settings.js:187
 msgid "Developer Settings"
 msgstr ""
 
-#: src/screens/Settings.js:188
+#: src/screens/Settings.js:189
 msgid "Network Settings"
 msgstr ""
 
@@ -881,12 +888,6 @@ msgstr ""
 msgid "Connect"
 msgstr ""
 
-#.  translator: Used when the QR Code Scanner is opened, and user will manually
-#.  enter the information.
-#: src/screens/Reown/ReownScan.js:41
-msgid "Manual"
-msgstr ""
-
 #: src/screens/Reown/SignMessageRequestScreen.js:25
 msgid "Sign Message Request"
 msgstr ""
@@ -1042,9 +1043,8 @@ msgstr ""
 msgid "after the contract is registered."
 msgstr ""
 
-#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
-#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
-msgid "Register Nano Contract"
+#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
+msgid "Nano Contract Registration"
 msgstr ""
 
 #: src/screens/NanoContract/NanoContractTransactionScreen.js:39
diff --git a/locale/pt-br/texts.po b/locale/pt-br/texts.po
index 641483abc..01e276396 100644
--- a/locale/pt-br/texts.po
+++ b/locale/pt-br/texts.po
@@ -57,11 +57,11 @@ msgid "[Last] dddd [•] HH:mm"
 msgstr "[Última] dddd [•] HH:mm"
 
 #.  See https://momentjs.com/docs/#/displaying/calendar-time/
-#: src/models.js:107 src/utils.js:546
+#: src/models.js:107 src/utils.js:553
 msgid "DD MMM YYYY [•] HH:mm"
 msgstr "DD MMM YYYY [•] HH:mm"
 
-#: src/utils.js:220
+#: src/utils.js:227
 msgid "Invalid address"
 msgstr "Endereço inválido"
 
@@ -452,7 +452,7 @@ msgstr "Digite suas palavras separadas por espaços"
 #: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:358
 #: src/screens/LoadHistoryScreen.js:51 src/screens/LoadWalletErrorScreen.js:20
 #: src/screens/NanoContract/NanoContractRegisterScreen.js:168
-#: src/screens/PinScreen.js:274
+#: src/screens/PinScreen.js:285
 msgid "Try again"
 msgstr "Tente novamente"
 
@@ -474,52 +474,53 @@ msgstr "**${ loadedData.addresses } endereços** encontrados"
 msgid "There's been an error connecting to the server."
 msgstr "Ocorreu um erro ao conectar com o servidor."
 
-#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:303
-#: src/screens/Settings.js:161
+#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:314
+#: src/screens/Settings.js:162
 msgid "Reset wallet"
 msgstr "Resetar Wallet"
 
-#: src/screens/MainScreen.js:126
+#: src/screens/MainScreen.js:127
 msgid "No transactions"
 msgstr "Nenhuma transação"
 
-#: src/screens/MainScreen.js:129
+#: src/screens/MainScreen.js:130
 msgid "|share:Share your address| with friends and start exchanging tokens"
 msgstr ""
 "|share:Compartilhe seu endereço| com seus amigos e comece a trocar seus "
 "tokens"
 
-#: src/screens/MainScreen.js:146
+#: src/screens/MainScreen.js:147
 msgid "Loading transactions"
 msgstr "Carregando transações"
 
-#: src/screens/MainScreen.js:155
+#: src/screens/MainScreen.js:156
 msgid "There was an error loading your transaction history"
 msgstr "Ocorreu um erro ao carregar seu histórico de transações"
 
-#: src/screens/MainScreen.js:158
+#: src/screens/MainScreen.js:159
 msgid "Please |tryAgain:try again|"
 msgstr "Por favor |tryAgain:tente novamente|"
 
-#: src/screens/MainScreen.js:535 src/screens/MainScreen.js:567
+#: src/screens/MainScreen.js:536 src/screens/MainScreen.js:568
 msgid "Available Balance"
 msgstr "Saldo Disponível"
 
-#: src/screens/MainScreen.js:544
+#: src/screens/MainScreen.js:545
 msgid "Locked"
 msgstr "Bloqueado"
 
 #.  translator: Used when the QR Code Scanner is opened, and user will manually
 #.  enter the information.
 #: src/screens/NanoContractRegisterQrCodeScreen.js:26
-#: src/screens/RegisterToken.js:27 src/screens/SendScanQRCode.js:87
-msgid "Manual info"
+#: src/screens/Reown/ReownScan.js:41
+msgid "Manual"
 msgstr "Digitar"
 
-#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
+#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
+#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
 #: src/screens/NanoContractRegisterQrCodeScreen.js:48
-msgid "Nano Contract Registration"
-msgstr "Registro do Nano Contract"
+msgid "Register Nano Contract"
+msgstr "Registrar Nano Contract"
 
 #: src/screens/NanoContractRegisterQrCodeScreen.js:63
 msgid "Scan the nano contract ID QR code"
@@ -559,31 +560,31 @@ msgstr "Recebido"
 msgid "Waiting confirmation"
 msgstr "Aguardando confirmação"
 
-#: src/screens/PinScreen.js:263
+#: src/screens/PinScreen.js:274
 msgid "Incorrect PIN Code. Try again."
 msgstr "PIN incorreto. Tente novamente."
 
-#: src/screens/PinScreen.js:74
+#: src/screens/PinScreen.js:77
 msgid "Enter your PIN Code "
 msgstr "Digite seu PIN "
 
-#: src/screens/PinScreen.js:75
+#: src/screens/PinScreen.js:78
 msgid "Unlock Hathor Wallet"
 msgstr "Desbloqueie sua Hathor Wallet"
 
 #: src/components/Reown/CreateTokenModal.js:60
 #: src/components/Reown/NanoContract/NewNanoContractTransactionModal.js:65
 #: src/components/Reown/NanoContract/SignOracleDataModal.js:79
-#: src/components/Reown/SignMessageModal.js:79 src/screens/PinScreen.js:300
+#: src/components/Reown/SignMessageModal.js:79 src/screens/PinScreen.js:311
 #: src/screens/Reown/ReownList.js:125
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/screens/PinScreen.js:334 src/screens/PinScreen.js:338
+#: src/screens/PinScreen.js:345 src/screens/PinScreen.js:349
 msgid "Biometry failed or canceled."
 msgstr "Biometria falhou ou foi cancelada."
 
-#: src/screens/PushNotification.js:58 src/screens/Settings.js:135
+#: src/screens/PushNotification.js:58 src/screens/Settings.js:136
 msgid "Push Notification"
 msgstr "Notificação"
 
@@ -618,6 +619,12 @@ msgstr "Requisição de Pagamento"
 msgid "RECEIVE"
 msgstr "RECEBER"
 
+#.  translator: Used when the QR Code Scanner is opened, and user will manually
+#.  enter the information.
+#: src/screens/RegisterToken.js:27 src/screens/SendScanQRCode.js:87
+msgid "Manual info"
+msgstr "Digitar"
+
 #: src/screens/RegisterToken.js:42 src/screens/RegisterTokenManual.js:126
 msgid "REGISTER TOKEN"
 msgstr "REGISTRAR UM TOKEN"
@@ -678,36 +685,36 @@ msgstr ""
 msgid "Reset Wallet"
 msgstr "Resetar Wallet"
 
-#: src/screens/Security.js:130
+#: src/screens/Security.js:131
 msgid "Disable biometry"
 msgstr "Desativar biometria"
 
-#: src/screens/Security.js:131
+#: src/screens/Security.js:132
 msgid "Disabling biometry"
 msgstr "Desativando biometria"
 
-#: src/screens/Security.js:143
+#: src/screens/Security.js:144
 msgid "Enter your 6-digit pin to enable biometry"
 msgstr "Digite seu PIN de 6 dígitos para habilitar biometria"
 
-#: src/screens/Security.js:154
+#: src/screens/Security.js:155
 msgid "No biometry supported"
 msgstr "Nenhuma biometria suportada"
 
-#: src/screens/Security.js:154
+#: src/screens/Security.js:155
 #, javascript-format
 msgid "Use ${ this.supportedBiometry }"
 msgstr "Usar ${ this.supportedBiometry }"
 
-#: src/screens/Security.js:159
+#: src/screens/Security.js:160
 msgid "SECURITY"
 msgstr "SEGURANÇA"
 
-#: src/screens/Security.js:183
+#: src/screens/Security.js:184
 msgid "Change PIN"
 msgstr "Mudar PIN"
 
-#: src/screens/Security.js:188
+#: src/screens/Security.js:189
 msgid "Lock wallet"
 msgstr "Bloquear a wallet"
 
@@ -780,43 +787,43 @@ msgstr "Você não tem o token requisitado [${ tokenLabel }]"
 msgid "Scan the QR code"
 msgstr "Leia o QR code"
 
-#: src/screens/Settings.js:104
+#: src/screens/Settings.js:105
 msgid "You are connected to"
 msgstr "Você está conectado à"
 
-#: src/screens/Settings.js:112
+#: src/screens/Settings.js:113
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: src/screens/Settings.js:116
+#: src/screens/Settings.js:117
 msgid "Connected to"
 msgstr "Conectado ao servidor"
 
-#: src/screens/Settings.js:129
+#: src/screens/Settings.js:130
 msgid "Security"
 msgstr "Segurança"
 
-#: src/screens/Settings.js:142
+#: src/screens/Settings.js:143
 msgid "Create a new token"
 msgstr "Criar um novo token"
 
-#: src/screens/Settings.js:149
+#: src/screens/Settings.js:150
 msgid "Register a token"
 msgstr "Registrar um token"
 
-#: src/screens/Settings.js:165
+#: src/screens/Settings.js:166
 msgid "About"
 msgstr "Sobre"
 
-#: src/screens/Settings.js:172
+#: src/screens/Settings.js:173
 msgid "Unique app identifier"
 msgstr "Identificador único do aplicativo"
 
-#: src/screens/Settings.js:186
+#: src/screens/Settings.js:187
 msgid "Developer Settings"
 msgstr "Configurações do Desenvolvedor"
 
-#: src/screens/Settings.js:188
+#: src/screens/Settings.js:189
 msgid "Network Settings"
 msgstr "Configurações de Rede"
 
@@ -900,12 +907,6 @@ msgstr ""
 msgid "Connect"
 msgstr "Conectar"
 
-#.  translator: Used when the QR Code Scanner is opened, and user will manually
-#.  enter the information.
-#: src/screens/Reown/ReownScan.js:41
-msgid "Manual"
-msgstr "Digitar"
-
 #: src/screens/Reown/SignMessageRequestScreen.js:25
 msgid "Sign Message Request"
 msgstr "Solicitação de Assinatura de Mensagem"
@@ -1070,10 +1071,9 @@ msgstr "Se deseja alterar o endereço de assinatura, você pode alterar"
 msgid "after the contract is registered."
 msgstr "depois do contrato ser registrado."
 
-#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
-#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
-msgid "Register Nano Contract"
-msgstr "Registrar Nano Contract"
+#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
+msgid "Nano Contract Registration"
+msgstr "Registro do Nano Contract"
 
 #: src/screens/NanoContract/NanoContractTransactionScreen.js:39
 msgid "Nano Contract Transaction"
@@ -1701,8 +1701,7 @@ msgstr "Nova Solicitação de Assinatura do Oracle"
 
 #: src/components/Reown/NanoContract/SignOracleDataModal.js:67
 msgid "You have received a new Sign Oracle Data Request. Please"
-msgstr ""
-"Você recebeu uma nova Solicitação de Assinatura do Oracle. Por favor,"
+msgstr "Você recebeu uma nova Solicitação de Assinatura do Oracle. Por favor,"
 
 #: src/components/Reown/NanoContract/SignOracleDataModal.js:75
 msgid "Review Sign Oracle Data Request details"
diff --git a/locale/ru-ru/texts.po b/locale/ru-ru/texts.po
index 42cc3de56..b4716b8f4 100644
--- a/locale/ru-ru/texts.po
+++ b/locale/ru-ru/texts.po
@@ -58,11 +58,11 @@ msgid "[Last] dddd [•] HH:mm"
 msgstr "[Последний] dddd [•] HH:mm"
 
 #.  See https://momentjs.com/docs/#/displaying/calendar-time/
-#: src/models.js:107 src/utils.js:546
+#: src/models.js:107 src/utils.js:553
 msgid "DD MMM YYYY [•] HH:mm"
 msgstr "DD MMM YYYY [•] HH:mm"
 
-#: src/utils.js:220
+#: src/utils.js:227
 msgid "Invalid address"
 msgstr "Неправильный адрес"
 
@@ -442,7 +442,7 @@ msgstr "Введите seed-фразу"
 #: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:358
 #: src/screens/LoadHistoryScreen.js:51 src/screens/LoadWalletErrorScreen.js:20
 #: src/screens/NanoContract/NanoContractRegisterScreen.js:168
-#: src/screens/PinScreen.js:274
+#: src/screens/PinScreen.js:285
 msgid "Try again"
 msgstr ""
 
@@ -464,50 +464,51 @@ msgstr "**${ loadedData.addresses } адресов** найдено"
 msgid "There's been an error connecting to the server."
 msgstr ""
 
-#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:303
-#: src/screens/Settings.js:161
+#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:314
+#: src/screens/Settings.js:162
 msgid "Reset wallet"
 msgstr "Сбросить кошелек"
 
-#: src/screens/MainScreen.js:126
+#: src/screens/MainScreen.js:127
 msgid "No transactions"
 msgstr "Нет транзакций"
 
-#: src/screens/MainScreen.js:129
+#: src/screens/MainScreen.js:130
 msgid "|share:Share your address| with friends and start exchanging tokens"
 msgstr ""
 "|share:Поделитесь своим адресом| с друзьями и начните обменивать свои токены"
 
-#: src/screens/MainScreen.js:146
+#: src/screens/MainScreen.js:147
 msgid "Loading transactions"
 msgstr "Загрузка ваших транзакций"
 
-#: src/screens/MainScreen.js:155
+#: src/screens/MainScreen.js:156
 msgid "There was an error loading your transaction history"
 msgstr ""
 
-#: src/screens/MainScreen.js:158
+#: src/screens/MainScreen.js:159
 msgid "Please |tryAgain:try again|"
 msgstr ""
 
-#: src/screens/MainScreen.js:535 src/screens/MainScreen.js:567
+#: src/screens/MainScreen.js:536 src/screens/MainScreen.js:568
 msgid "Available Balance"
 msgstr "Доступный Баланс"
 
-#: src/screens/MainScreen.js:544
+#: src/screens/MainScreen.js:545
 msgid "Locked"
 msgstr "Заблокированный"
 
 #.  translator: Used when the QR Code Scanner is opened, and user will manually
 #.  enter the information.
 #: src/screens/NanoContractRegisterQrCodeScreen.js:26
-#: src/screens/RegisterToken.js:27 src/screens/SendScanQRCode.js:87
-msgid "Manual info"
-msgstr "Ручной ввод"
+#: src/screens/Reown/ReownScan.js:41
+msgid "Manual"
+msgstr ""
 
-#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
+#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
+#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
 #: src/screens/NanoContractRegisterQrCodeScreen.js:48
-msgid "Nano Contract Registration"
+msgid "Register Nano Contract"
 msgstr ""
 
 #: src/screens/NanoContractRegisterQrCodeScreen.js:63
@@ -548,31 +549,31 @@ msgstr "Получено"
 msgid "Waiting confirmation"
 msgstr "Ожидание подтверждения"
 
-#: src/screens/PinScreen.js:263
+#: src/screens/PinScreen.js:274
 msgid "Incorrect PIN Code. Try again."
 msgstr "Неверный PIN-код. Попробуйте еще раз."
 
-#: src/screens/PinScreen.js:74
+#: src/screens/PinScreen.js:77
 msgid "Enter your PIN Code "
 msgstr "Введите свой PIN-код "
 
-#: src/screens/PinScreen.js:75
+#: src/screens/PinScreen.js:78
 msgid "Unlock Hathor Wallet"
 msgstr "Разблокировать Hathor Wallet"
 
 #: src/components/Reown/CreateTokenModal.js:60
 #: src/components/Reown/NanoContract/NewNanoContractTransactionModal.js:65
 #: src/components/Reown/NanoContract/SignOracleDataModal.js:79
-#: src/components/Reown/SignMessageModal.js:79 src/screens/PinScreen.js:300
+#: src/components/Reown/SignMessageModal.js:79 src/screens/PinScreen.js:311
 #: src/screens/Reown/ReownList.js:125
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/screens/PinScreen.js:334 src/screens/PinScreen.js:338
+#: src/screens/PinScreen.js:345 src/screens/PinScreen.js:349
 msgid "Biometry failed or canceled."
 msgstr "Биометрия не удалась или была отменена."
 
-#: src/screens/PushNotification.js:58 src/screens/Settings.js:135
+#: src/screens/PushNotification.js:58 src/screens/Settings.js:136
 msgid "Push Notification"
 msgstr ""
 
@@ -605,6 +606,12 @@ msgstr "Запрос Средств"
 msgid "RECEIVE"
 msgstr "ПОЛУЧИТЬ"
 
+#.  translator: Used when the QR Code Scanner is opened, and user will manually
+#.  enter the information.
+#: src/screens/RegisterToken.js:27 src/screens/SendScanQRCode.js:87
+msgid "Manual info"
+msgstr "Ручной ввод"
+
 #: src/screens/RegisterToken.js:42 src/screens/RegisterTokenManual.js:126
 msgid "REGISTER TOKEN"
 msgstr "РЕГИСТРАЦИЯ ТОКЕНА"
@@ -663,36 +670,36 @@ msgstr ""
 msgid "Reset Wallet"
 msgstr "Сбросить Кошелек"
 
-#: src/screens/Security.js:130
+#: src/screens/Security.js:131
 msgid "Disable biometry"
 msgstr "Отключить биометрию"
 
-#: src/screens/Security.js:131
+#: src/screens/Security.js:132
 msgid "Disabling biometry"
 msgstr "Отключение биометрии"
 
-#: src/screens/Security.js:143
+#: src/screens/Security.js:144
 msgid "Enter your 6-digit pin to enable biometry"
 msgstr "Введите 6-значный PIN-код, чтобы включить биометрию"
 
-#: src/screens/Security.js:154
+#: src/screens/Security.js:155
 msgid "No biometry supported"
 msgstr "Биометрия не поддерживается"
 
-#: src/screens/Security.js:154
+#: src/screens/Security.js:155
 #, javascript-format
 msgid "Use ${ this.supportedBiometry }"
 msgstr "Использовать ${ this.supportedBiometry }"
 
-#: src/screens/Security.js:159
+#: src/screens/Security.js:160
 msgid "SECURITY"
 msgstr "БЕЗОПАСНОСТЬ"
 
-#: src/screens/Security.js:183
+#: src/screens/Security.js:184
 msgid "Change PIN"
 msgstr "Изменить PIN-код"
 
-#: src/screens/Security.js:188
+#: src/screens/Security.js:189
 msgid "Lock wallet"
 msgstr "Заблокировать кошелек"
 
@@ -766,43 +773,43 @@ msgstr "У вас нет запрошенного токена [${ tokenLabel }]
 msgid "Scan the QR code"
 msgstr "Сканировать QR-код"
 
-#: src/screens/Settings.js:104
+#: src/screens/Settings.js:105
 msgid "You are connected to"
 msgstr "Вы подключены к"
 
-#: src/screens/Settings.js:112
+#: src/screens/Settings.js:113
 msgid "General Settings"
 msgstr ""
 
-#: src/screens/Settings.js:116
+#: src/screens/Settings.js:117
 msgid "Connected to"
 msgstr "Подключены к"
 
-#: src/screens/Settings.js:129
+#: src/screens/Settings.js:130
 msgid "Security"
 msgstr "Безопасность"
 
-#: src/screens/Settings.js:142
+#: src/screens/Settings.js:143
 msgid "Create a new token"
 msgstr "Создать новый токен"
 
-#: src/screens/Settings.js:149
+#: src/screens/Settings.js:150
 msgid "Register a token"
 msgstr "Зарегистрировать токен"
 
-#: src/screens/Settings.js:165
+#: src/screens/Settings.js:166
 msgid "About"
 msgstr "О нас"
 
-#: src/screens/Settings.js:172
+#: src/screens/Settings.js:173
 msgid "Unique app identifier"
 msgstr ""
 
-#: src/screens/Settings.js:186
+#: src/screens/Settings.js:187
 msgid "Developer Settings"
 msgstr ""
 
-#: src/screens/Settings.js:188
+#: src/screens/Settings.js:189
 msgid "Network Settings"
 msgstr ""
 
@@ -885,12 +892,6 @@ msgstr ""
 msgid "Connect"
 msgstr ""
 
-#.  translator: Used when the QR Code Scanner is opened, and user will manually
-#.  enter the information.
-#: src/screens/Reown/ReownScan.js:41
-msgid "Manual"
-msgstr ""
-
 #: src/screens/Reown/SignMessageRequestScreen.js:25
 msgid "Sign Message Request"
 msgstr ""
@@ -1046,9 +1047,8 @@ msgstr ""
 msgid "after the contract is registered."
 msgstr ""
 
-#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
-#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
-msgid "Register Nano Contract"
+#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
+msgid "Nano Contract Registration"
 msgstr ""
 
 #: src/screens/NanoContract/NanoContractTransactionScreen.js:39
diff --git a/locale/texts.pot b/locale/texts.pot
index a99f94f81..04397ddc6 100644
--- a/locale/texts.pot
+++ b/locale/texts.pot
@@ -48,12 +48,12 @@ msgid "[Last] dddd [•] HH:mm"
 msgstr ""
 
 #: src/models.js:107
-#: src/utils.js:546
+#: src/utils.js:553
 #.  See https://momentjs.com/docs/#/displaying/calendar-time/
 msgid "DD MMM YYYY [•] HH:mm"
 msgstr ""
 
-#: src/utils.js:220
+#: src/utils.js:227
 msgid "Invalid address"
 msgstr ""
 
@@ -432,7 +432,7 @@ msgstr ""
 #: src/screens/LoadHistoryScreen.js:51
 #: src/screens/LoadWalletErrorScreen.js:20
 #: src/screens/NanoContract/NanoContractRegisterScreen.js:168
-#: src/screens/PinScreen.js:274
+#: src/screens/PinScreen.js:285
 msgid "Try again"
 msgstr ""
 
@@ -455,51 +455,51 @@ msgid "There's been an error connecting to the server."
 msgstr ""
 
 #: src/screens/LoadWalletErrorScreen.js:21
-#: src/screens/PinScreen.js:303
-#: src/screens/Settings.js:161
+#: src/screens/PinScreen.js:314
+#: src/screens/Settings.js:162
 msgid "Reset wallet"
 msgstr ""
 
-#: src/screens/MainScreen.js:126
+#: src/screens/MainScreen.js:127
 msgid "No transactions"
 msgstr ""
 
-#: src/screens/MainScreen.js:129
+#: src/screens/MainScreen.js:130
 msgid "|share:Share your address| with friends and start exchanging tokens"
 msgstr ""
 
-#: src/screens/MainScreen.js:146
+#: src/screens/MainScreen.js:147
 msgid "Loading transactions"
 msgstr ""
 
-#: src/screens/MainScreen.js:155
+#: src/screens/MainScreen.js:156
 msgid "There was an error loading your transaction history"
 msgstr ""
 
-#: src/screens/MainScreen.js:158
+#: src/screens/MainScreen.js:159
 msgid "Please |tryAgain:try again|"
 msgstr ""
 
-#: src/screens/MainScreen.js:535
-#: src/screens/MainScreen.js:567
+#: src/screens/MainScreen.js:536
+#: src/screens/MainScreen.js:568
 msgid "Available Balance"
 msgstr ""
 
-#: src/screens/MainScreen.js:544
+#: src/screens/MainScreen.js:545
 msgid "Locked"
 msgstr ""
 
 #: src/screens/NanoContractRegisterQrCodeScreen.js:26
-#: src/screens/RegisterToken.js:27
-#: src/screens/SendScanQRCode.js:87
+#: src/screens/Reown/ReownScan.js:41
 #.  translator: Used when the QR Code Scanner is opened, and user will manually
 #.  enter the information.
-msgid "Manual info"
+msgid "Manual"
 msgstr ""
 
-#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
+#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
+#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
 #: src/screens/NanoContractRegisterQrCodeScreen.js:48
-msgid "Nano Contract Registration"
+msgid "Register Nano Contract"
 msgstr ""
 
 #: src/screens/NanoContractRegisterQrCodeScreen.js:63
@@ -543,15 +543,15 @@ msgstr ""
 msgid "Waiting confirmation"
 msgstr ""
 
-#: src/screens/PinScreen.js:263
+#: src/screens/PinScreen.js:274
 msgid "Incorrect PIN Code. Try again."
 msgstr ""
 
-#: src/screens/PinScreen.js:74
+#: src/screens/PinScreen.js:77
 msgid "Enter your PIN Code "
 msgstr ""
 
-#: src/screens/PinScreen.js:75
+#: src/screens/PinScreen.js:78
 msgid "Unlock Hathor Wallet"
 msgstr ""
 
@@ -559,18 +559,18 @@ msgstr ""
 #: src/components/Reown/NanoContract/NewNanoContractTransactionModal.js:65
 #: src/components/Reown/NanoContract/SignOracleDataModal.js:79
 #: src/components/Reown/SignMessageModal.js:79
-#: src/screens/PinScreen.js:300
+#: src/screens/PinScreen.js:311
 #: src/screens/Reown/ReownList.js:125
 msgid "Cancel"
 msgstr ""
 
-#: src/screens/PinScreen.js:334
-#: src/screens/PinScreen.js:338
+#: src/screens/PinScreen.js:345
+#: src/screens/PinScreen.js:349
 msgid "Biometry failed or canceled."
 msgstr ""
 
 #: src/screens/PushNotification.js:58
-#: src/screens/Settings.js:135
+#: src/screens/Settings.js:136
 msgid "Push Notification"
 msgstr ""
 
@@ -603,6 +603,13 @@ msgstr ""
 msgid "RECEIVE"
 msgstr ""
 
+#: src/screens/RegisterToken.js:27
+#: src/screens/SendScanQRCode.js:87
+#.  translator: Used when the QR Code Scanner is opened, and user will manually
+#.  enter the information.
+msgid "Manual info"
+msgstr ""
+
 #: src/screens/RegisterToken.js:42
 #: src/screens/RegisterTokenManual.js:126
 msgid "REGISTER TOKEN"
@@ -658,36 +665,36 @@ msgstr ""
 msgid "Reset Wallet"
 msgstr ""
 
-#: src/screens/Security.js:130
+#: src/screens/Security.js:131
 msgid "Disable biometry"
 msgstr ""
 
-#: src/screens/Security.js:131
+#: src/screens/Security.js:132
 msgid "Disabling biometry"
 msgstr ""
 
-#: src/screens/Security.js:143
+#: src/screens/Security.js:144
 msgid "Enter your 6-digit pin to enable biometry"
 msgstr ""
 
-#: src/screens/Security.js:154
+#: src/screens/Security.js:155
 msgid "No biometry supported"
 msgstr ""
 
-#: src/screens/Security.js:154
+#: src/screens/Security.js:155
 #, javascript-format
 msgid "Use ${ this.supportedBiometry }"
 msgstr ""
 
-#: src/screens/Security.js:159
+#: src/screens/Security.js:160
 msgid "SECURITY"
 msgstr ""
 
-#: src/screens/Security.js:183
+#: src/screens/Security.js:184
 msgid "Change PIN"
 msgstr ""
 
-#: src/screens/Security.js:188
+#: src/screens/Security.js:189
 msgid "Lock wallet"
 msgstr ""
 
@@ -766,43 +773,43 @@ msgstr ""
 msgid "Scan the QR code"
 msgstr ""
 
-#: src/screens/Settings.js:104
+#: src/screens/Settings.js:105
 msgid "You are connected to"
 msgstr ""
 
-#: src/screens/Settings.js:112
+#: src/screens/Settings.js:113
 msgid "General Settings"
 msgstr ""
 
-#: src/screens/Settings.js:116
+#: src/screens/Settings.js:117
 msgid "Connected to"
 msgstr ""
 
-#: src/screens/Settings.js:129
+#: src/screens/Settings.js:130
 msgid "Security"
 msgstr ""
 
-#: src/screens/Settings.js:142
+#: src/screens/Settings.js:143
 msgid "Create a new token"
 msgstr ""
 
-#: src/screens/Settings.js:149
+#: src/screens/Settings.js:150
 msgid "Register a token"
 msgstr ""
 
-#: src/screens/Settings.js:165
+#: src/screens/Settings.js:166
 msgid "About"
 msgstr ""
 
-#: src/screens/Settings.js:172
+#: src/screens/Settings.js:173
 msgid "Unique app identifier"
 msgstr ""
 
-#: src/screens/Settings.js:186
+#: src/screens/Settings.js:187
 msgid "Developer Settings"
 msgstr ""
 
-#: src/screens/Settings.js:188
+#: src/screens/Settings.js:189
 msgid "Network Settings"
 msgstr ""
 
@@ -883,12 +890,6 @@ msgstr ""
 msgid "Connect"
 msgstr ""
 
-#: src/screens/Reown/ReownScan.js:41
-#.  translator: Used when the QR Code Scanner is opened, and user will manually
-#.  enter the information.
-msgid "Manual"
-msgstr ""
-
 #: src/screens/Reown/SignMessageRequestScreen.js:25
 msgid "Sign Message Request"
 msgstr ""
@@ -1044,9 +1045,8 @@ msgstr ""
 msgid "after the contract is registered."
 msgstr ""
 
-#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
-#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
-msgid "Register Nano Contract"
+#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
+msgid "Nano Contract Registration"
 msgstr ""
 
 #: src/screens/NanoContract/NanoContractTransactionScreen.js:39
diff --git a/src/components/SimpleButton.js b/src/components/SimpleButton.js
index 41a1f6e7e..2af1c586c 100644
--- a/src/components/SimpleButton.js
+++ b/src/components/SimpleButton.js
@@ -44,6 +44,7 @@ const SimpleButton = ({
         <Text
           numberOfLines={1}
           adjustsFontSizeToFit
+          minimumFontScale={0.8}
           style={textStyles}
         >
           {title}
diff --git a/src/screens/NanoContractRegisterQrCodeScreen.js b/src/screens/NanoContractRegisterQrCodeScreen.js
index 004b8fcfe..ac8186ac3 100644
--- a/src/screens/NanoContractRegisterQrCodeScreen.js
+++ b/src/screens/NanoContractRegisterQrCodeScreen.js
@@ -23,7 +23,7 @@ export const NanoContractRegisterQrCodeScreen = ({ navigation }) => {
     <SimpleButton
       // translator: Used when the QR Code Scanner is opened, and user will manually
       // enter the information.
-      title={t`Manual info`}
+      title={t`Manual`}
       onPress={() => navigation.navigate('NanoContractRegisterScreen')}
     />
   );
@@ -45,7 +45,7 @@ export const NanoContractRegisterQrCodeScreen = ({ navigation }) => {
       }}
       >
         <HathorHeader
-          title={t`Nano Contract Registration`.toUpperCase()}
+          title={t`Register Nano Contract`.toUpperCase()}
           onBackPress={() => navigation.pop()}
           rightElement={renderHeaderRightElement()}
         />

From aaccfde3f80346be67c3c65b93ddd19a2bcbcc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Abadesso?= <andre.abadesso@gmail.com>
Date: Sun, 10 Nov 2024 11:45:25 -0300
Subject: [PATCH 5/6] chore: bumped to v0.30.0-rc.3 (#625)

---
 android/app/build.gradle                   | 4 ++--
 ios/HathorMobile.xcodeproj/project.pbxproj | 4 ++--
 package-lock.json                          | 4 ++--
 package.json                               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index e6bd58328..46c69cf48 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -79,8 +79,8 @@ android {
         applicationId "network.hathor.wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 82
-        versionName "0.30.0-rc.2"
+        versionCode 83
+        versionName "0.30.0-rc.3"
         missingDimensionStrategy "react-native-camera", "general"
     }
     signingConfigs {
diff --git a/ios/HathorMobile.xcodeproj/project.pbxproj b/ios/HathorMobile.xcodeproj/project.pbxproj
index c20370fc4..163f74fff 100644
--- a/ios/HathorMobile.xcodeproj/project.pbxproj
+++ b/ios/HathorMobile.xcodeproj/project.pbxproj
@@ -476,7 +476,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 0.2.0;
+				CURRENT_PROJECT_VERSION = 0.3.0;
 				DEVELOPMENT_TEAM = 55SHY647CG;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = HathorMobile/Info.plist;
@@ -506,7 +506,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 0.2.0;
+				CURRENT_PROJECT_VERSION = 0.3.0;
 				DEVELOPMENT_TEAM = 55SHY647CG;
 				INFOPLIST_FILE = HathorMobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
diff --git a/package-lock.json b/package-lock.json
index 83a53b3dc..ce042010f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "HathorMobile",
-  "version": "0.30.0-rc.2",
+  "version": "0.30.0-rc.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "HathorMobile",
-      "version": "0.30.0-rc.2",
+      "version": "0.30.0-rc.3",
       "dependencies": {
         "@ethersproject/shims": "5.7.0",
         "@fortawesome/fontawesome-svg-core": "1.2.36",
diff --git a/package.json b/package.json
index b7e3abc8d..fd709a8ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "HathorMobile",
-  "version": "0.30.0-rc.2",
+  "version": "0.30.0-rc.3",
   "engines": {
     "node": ">=18.0.0",
     "npm": ">=9.0.0"

From 8232f9870f7f74bf42e59050bdcbc8b4c43d2358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Abadesso?= <andre.abadesso@gmail.com>
Date: Sun, 10 Nov 2024 15:05:17 -0300
Subject: [PATCH 6/6] chore: bump to v0.3.0 (#627)

---
 android/app/build.gradle                   | 4 ++--
 ios/HathorMobile.xcodeproj/project.pbxproj | 4 ++--
 package-lock.json                          | 4 ++--
 package.json                               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 46c69cf48..ea9fd74fe 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -79,8 +79,8 @@ android {
         applicationId "network.hathor.wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 83
-        versionName "0.30.0-rc.3"
+        versionCode 84
+        versionName "0.30.0"
         missingDimensionStrategy "react-native-camera", "general"
     }
     signingConfigs {
diff --git a/ios/HathorMobile.xcodeproj/project.pbxproj b/ios/HathorMobile.xcodeproj/project.pbxproj
index 163f74fff..f58ceef3d 100644
--- a/ios/HathorMobile.xcodeproj/project.pbxproj
+++ b/ios/HathorMobile.xcodeproj/project.pbxproj
@@ -476,7 +476,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 0.3.0;
+				CURRENT_PROJECT_VERSION = 1.0.0;
 				DEVELOPMENT_TEAM = 55SHY647CG;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = HathorMobile/Info.plist;
@@ -506,7 +506,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 0.3.0;
+				CURRENT_PROJECT_VERSION = 1.0.0;
 				DEVELOPMENT_TEAM = 55SHY647CG;
 				INFOPLIST_FILE = HathorMobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
diff --git a/package-lock.json b/package-lock.json
index ce042010f..345111db6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "HathorMobile",
-  "version": "0.30.0-rc.3",
+  "version": "0.30.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "HathorMobile",
-      "version": "0.30.0-rc.3",
+      "version": "0.30.0",
       "dependencies": {
         "@ethersproject/shims": "5.7.0",
         "@fortawesome/fontawesome-svg-core": "1.2.36",
diff --git a/package.json b/package.json
index fd709a8ec..1f1411f18 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "HathorMobile",
-  "version": "0.30.0-rc.3",
+  "version": "0.30.0",
   "engines": {
     "node": ">=18.0.0",
     "npm": ">=9.0.0"