[v0.39.0] Sync master with release

android/app/build.gradle

@@ -84,8 +84,8 @@ android {
         applicationId "network.hathor.wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 124
-        versionName "0.38.0"
+        versionCode 129
+        versionName "0.39.0"
         missingDimensionStrategy "react-native-camera", "general"
     }
 

ios/HathorMobile.xcodeproj/project.pbxproj

@@ -435,7 +435,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.38.0;
+				MARKETING_VERSION = 0.39.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -465,7 +465,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.38.0;
+				MARKETING_VERSION = 0.39.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

locale/da/texts.po

@@ -326,7 +326,7 @@ msgid "Back"
 msgstr ""
 
 #: src/screens/CreateTokenAmount.js:96 src/screens/CreateTokenAmount.js:108
-#: src/screens/SendAmountInput.js:142
+#: src/screens/SendAmountInput.js:92
 msgid "Invalid amount"
 msgstr ""
 
@@ -355,7 +355,7 @@ msgstr ""
 #: src/screens/CreateTokenAmount.js:211 src/screens/CreateTokenName.js:67
 #: src/screens/CreateTokenSymbol.js:86 src/screens/InitWallet.js:229
 #: src/screens/InitWallet.js:382 src/screens/SendAddressInput.js:66
-#: src/screens/SendAmountInput.js:239
+#: src/screens/SendAmountInput.js:169
 msgid "Next"
 msgstr "Næste"
 
@@ -383,8 +383,8 @@ msgstr "Indtast din 6-cifrede pin for at oprette din token"
 msgid "Authorize token creation"
 msgstr "Autoriser oprettelse af token"
 
-#: src/screens/CreateTokenConfirm.js:158 src/screens/SendConfirmScreen.js:105
-#: src/screens/TokenSwapReview.js:205
+#: src/screens/CreateTokenConfirm.js:158 src/screens/SendConfirmScreen.js:196
+#: src/screens/TokenSwapReview.js:221
 msgid "Building transaction"
 msgstr ""
 
@@ -397,25 +397,25 @@ msgstr ""
 msgid "Amount of ${ name }"
 msgstr ""
 
-#: src/screens/CreateTokenConfirm.js:238
+#: src/screens/CreateTokenConfirm.js:243
 msgid "Token name"
 msgstr "Token navn"
 
-#: src/screens/CreateTokenConfirm.js:244 src/screens/CreateTokenSymbol.js:71
+#: src/screens/CreateTokenConfirm.js:249 src/screens/CreateTokenSymbol.js:71
 msgid "Token symbol"
 msgstr "Token symbol"
 
 #: src/components/Reown/CreateTokenRequest.js:87
 #: src/components/Reown/CreateTokenRequest.js:129
-#: src/screens/CreateTokenConfirm.js:251
+#: src/screens/CreateTokenConfirm.js:256
 msgid "Deposit"
 msgstr "Indsæt"
 
-#: src/screens/CreateTokenConfirm.js:259
+#: src/screens/CreateTokenConfirm.js:264
 msgid "Network fee"
 msgstr ""
 
-#: src/screens/CreateTokenConfirm.js:268
+#: src/screens/CreateTokenConfirm.js:273
 msgid "Create token"
 msgstr "Opret token"
 
@@ -708,31 +708,31 @@ msgstr "Nulstil wallet"
 msgid "Connect to mainnet"
 msgstr ""
 
-#: src/screens/MainScreen.js:125
+#: src/screens/MainScreen.js:136
 msgid "No transactions"
 msgstr "Ingen transaktioner"
 
-#: src/screens/MainScreen.js:128
+#: src/screens/MainScreen.js:139
 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:145
+#: src/screens/MainScreen.js:156
 msgid "Loading transactions"
 msgstr "Indlæser dine transaktioner"
 
-#: src/screens/MainScreen.js:154
+#: src/screens/MainScreen.js:165
 msgid "There was an error loading your transaction history"
 msgstr ""
 
-#: src/screens/MainScreen.js:157
+#: src/screens/MainScreen.js:168
 msgid "Please |tryAgain:try again|"
 msgstr ""
 
-#: src/screens/MainScreen.js:540 src/screens/MainScreen.js:569
+#: src/screens/MainScreen.js:551 src/screens/MainScreen.js:580
 msgid "Available Balance"
 msgstr "Tilgængelig saldo"
 
-#: src/screens/MainScreen.js:549
+#: src/screens/MainScreen.js:560
 msgid "Locked"
 msgstr "Låst"
 
@@ -962,103 +962,110 @@ msgstr "SEND"
 msgid "Address to send"
 msgstr "Adresse, der skal sendes til"
 
-#: src/screens/SendAmountInput.js:147
+#: src/screens/SendAmountInput.js:97
 msgid "Insufficient funds"
 msgstr "Utilstrækkelige midler"
 
-#: src/screens/SendAmountInput.js:154
-msgid "Calculating network fee..."
-msgstr ""
-
-#: src/screens/SendAmountInput.js:161 src/screens/SendAmountInput.js:166
-msgid "Insufficient balance of HTR to cover the network fee."
-msgstr ""
-
-#: src/screens/SendAmountInput.js:193
+#: src/screens/SendAmountInput.js:123
 #, javascript-format
 msgid "${ amountAndToken } available"
 msgid_plural "${ amountAndToken } available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/screens/SendAmountInput.js:207 src/screens/SendConfirmScreen.js:193
+#: src/screens/SendAmountInput.js:137 src/screens/SendConfirmScreen.js:287
 msgid "SEND ${ tokenNameUpperCase }"
 msgstr "SEND ${ tokenNameUpperCase }"
 
-#: src/screens/SendConfirmScreen.js:33 src/screens/TokenSwapReview.js:304
+#: src/screens/SendConfirmScreen.js:42 src/screens/TokenSwapReview.js:320
 msgid "No fee"
 msgstr ""
 
-#.  show loading modal
-#: src/screens/SendConfirmScreen.js:90 src/screens/TokenSwapReview.js:189
+#: src/screens/SendConfirmScreen.js:54
+msgid "Insufficient HTR to cover the network fee."
+msgstr ""
+
+#: src/screens/SendConfirmScreen.js:57
+msgid "Insufficient balance to send this transaction."
+msgstr ""
+
+#: src/screens/SendConfirmScreen.js:59
+msgid "Failed to process transaction."
+msgstr ""
+
+#: src/screens/SendConfirmScreen.js:178 src/screens/TokenSwapReview.js:205
 msgid "Your transfer is being processed"
 msgstr "Din overførsel behandles"
 
-#: src/sagas/helpers.js:147 src/screens/SendConfirmScreen.js:103
-#: src/screens/TokenSwapReview.js:203
+#: src/sagas/helpers.js:147 src/screens/SendConfirmScreen.js:194
+#: src/screens/TokenSwapReview.js:219
 msgid "Enter your 6-digit pin to authorize operation"
 msgstr "Indtast din 6-cifrede pin for at godkende overførslen"
 
-#: src/sagas/helpers.js:148 src/screens/SendConfirmScreen.js:104
-#: src/screens/TokenSwapReview.js:204
+#: src/sagas/helpers.js:148 src/screens/SendConfirmScreen.js:195
+#: src/screens/TokenSwapReview.js:220
 msgid "Authorize operation"
 msgstr "Autoriserer overførslen"
 
-#: src/screens/SendConfirmScreen.js:140
+#: src/screens/SendConfirmScreen.js:235
 #, javascript-format
 msgid "${ availablePretty } available"
 msgid_plural "${ availablePretty } available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/screens/SendConfirmScreen.js:164
+#: src/screens/SendConfirmScreen.js:258
 msgid "Loading fee information..."
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:167
+#: src/screens/SendConfirmScreen.js:261
 msgid "This is the native token, no network fees are charged."
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:170
+#: src/screens/SendConfirmScreen.js:264
 msgid "This token is Deposit Based, no network fee will be charged."
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:172
+#: src/screens/SendConfirmScreen.js:266
 msgid "This fee is fixed and required for every transfer of this token."
 msgstr ""
 
 #: src/components/Reown/NanoContract/NanoContractExecInfo.js:108
-#: src/screens/SendConfirmScreen.js:177
+#: src/screens/SendConfirmScreen.js:271
 msgid "Loading..."
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:202
+#: src/screens/SendConfirmScreen.js:293
+msgid "Building your transaction"
+msgstr ""
+
+#: src/screens/SendConfirmScreen.js:311
 #, javascript-format
 msgid "Your transfer of **${ amountAndToken }** has been confirmed"
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:213
+#: src/screens/SendConfirmScreen.js:322
 msgid "Read more."
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:229
+#: src/screens/SendConfirmScreen.js:344
 msgid "**Transaction summary**"
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:232
+#: src/screens/SendConfirmScreen.js:347
 msgid "**To**"
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:237
+#: src/screens/SendConfirmScreen.js:352
 msgid "**Network Fee**"
 msgstr ""
 
-#: src/screens/SendConfirmScreen.js:245
+#: src/screens/SendConfirmScreen.js:360
 msgid "**Total**"
 msgstr ""
 
 #: src/screens/NetworkSettings/CustomNetworkSettingsScreen.js:295
-#: src/screens/SendConfirmScreen.js:252
+#: src/screens/SendConfirmScreen.js:367
 msgid "Send"
 msgstr "Send"
 
@@ -1145,25 +1152,25 @@ msgstr ""
 msgid "Loading Token Swap"
 msgstr ""
 
-#: src/screens/TokenSwapReview.js:215
+#: src/screens/TokenSwapReview.js:231
 msgid "REVIEW TOKEN SWAP"
 msgstr ""
 
-#: src/screens/TokenSwapReview.js:221
+#: src/screens/TokenSwapReview.js:237
 msgid "Building the swap transaction for your review"
 msgstr ""
 
-#: src/screens/TokenSwapReview.js:239
+#: src/screens/TokenSwapReview.js:255
 msgid "Your swap was successful"
 msgstr ""
 
 #: src/components/Reown/CreateTokenRequest.js:130
 #: src/components/Reown/TransactionFees.js:55
-#: src/screens/TokenSwapReview.js:300
+#: src/screens/TokenSwapReview.js:316
 msgid "Network Fee"
 msgstr ""
 
-#: src/screens/TokenSwapReview.js:312
+#: src/screens/TokenSwapReview.js:328
 msgid "SWAP"
 msgstr ""