Skip to content

Commit fa3ed71

Browse files
andreabadessoandreabadesso
committed
Merge branch 'master' into fix/errors-on-ses
2 parents f829b64 + 2a65bf2 commit fa3ed71

File tree

11 files changed

+179
-140
lines changed

11 files changed

+179
-140
lines changed

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ android {
7979
applicationId "network.hathor.wallet"
8080
minSdkVersion rootProject.ext.minSdkVersion
8181
targetSdkVersion rootProject.ext.targetSdkVersion
82-
versionCode 72
83-
versionName "0.27.2"
82+
versionCode 74
83+
versionName "0.28.0-rc.2"
8484
missingDimensionStrategy "react-native-camera", "general"
8585
}
8686
signingConfigs {

‎ios/HathorMobile.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@
476476
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
477477
CLANG_ENABLE_MODULES = YES;
478478
CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
479-
CURRENT_PROJECT_VERSION = 1.0.0;
479+
CURRENT_PROJECT_VERSION = 0.2.0;
480480
DEVELOPMENT_TEAM = 55SHY647CG;
481481
ENABLE_BITCODE = NO;
482482
INFOPLIST_FILE = HathorMobile/Info.plist;
@@ -485,7 +485,7 @@
485485
"$(inherited)",
486486
"@executable_path/Frameworks",
487487
);
488-
MARKETING_VERSION = 0.27.2;
488+
MARKETING_VERSION = 0.28.0;
489489
OTHER_LDFLAGS = (
490490
"$(inherited)",
491491
"-ObjC",
@@ -506,15 +506,15 @@
506506
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
507507
CLANG_ENABLE_MODULES = YES;
508508
CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
509-
CURRENT_PROJECT_VERSION = 1.0.0;
509+
CURRENT_PROJECT_VERSION = 0.2.0;
510510
DEVELOPMENT_TEAM = 55SHY647CG;
511511
INFOPLIST_FILE = HathorMobile/Info.plist;
512512
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
513513
LD_RUNPATH_SEARCH_PATHS = (
514514
"$(inherited)",
515515
"@executable_path/Frameworks",
516516
);
517-
MARKETING_VERSION = 0.27.2;
517+
MARKETING_VERSION = 0.28.0;
518518
OTHER_LDFLAGS = (
519519
"$(inherited)",
520520
"-ObjC",

‎locale/da/texts.po

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ msgid "[Last] dddd [•] HH:mm"
5757
msgstr "[Sidste] dddd [•] HH:mm"
5858

5959
#. See https://momentjs.com/docs/#/displaying/calendar-time/
60-
#: src/models.js:107 src/utils.js:445
60+
#: src/models.js:107 src/utils.js:502
6161
msgid "DD MMM YYYY [•] HH:mm"
6262
msgstr "DD MMM YYYY [•] HH:mm"
6363

64-
#: src/utils.js:180
64+
#: src/utils.js:220
6565
msgid "Invalid address"
6666
msgstr "Ugyldig adresse"
6767

@@ -441,7 +441,7 @@ msgstr "Indtast dine seed-ord adskilt med mellemrum"
441441
#: src/components/WalletConnect/NanoContract/NewNanoContractTransactionRequest.js:295
442442
#: src/screens/LoadHistoryScreen.js:51 src/screens/LoadWalletErrorScreen.js:20
443443
#: src/screens/NanoContract/NanoContractRegisterScreen.js:168
444-
#: src/screens/PinScreen.js:271
444+
#: src/screens/PinScreen.js:274
445445
msgid "Try again"
446446
msgstr ""
447447

@@ -463,7 +463,7 @@ msgstr "**${ props.loadedData.addresses } adresser** fundet"
463463
msgid "There's been an error connecting to the server."
464464
msgstr ""
465465

466-
#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:299
466+
#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:303
467467
#: src/screens/Settings.js:161
468468
msgid "Reset wallet"
469469
msgstr "Nulstil wallet"
@@ -547,27 +547,27 @@ msgstr "Modtaget"
547547
msgid "Waiting confirmation"
548548
msgstr "Venter på bekræftelse"
549549

550-
#: src/screens/PinScreen.js:260
550+
#: src/screens/PinScreen.js:263
551551
msgid "Incorrect PIN Code. Try again."
552552
msgstr "Forkert PIN-kode. Prøv igen."
553553

554-
#: src/screens/PinScreen.js:72
554+
#: src/screens/PinScreen.js:74
555555
msgid "Enter your PIN Code "
556556
msgstr "Indtast din pinkode "
557557

558-
#: src/screens/PinScreen.js:73
558+
#: src/screens/PinScreen.js:75
559559
msgid "Unlock Hathor Wallet"
560560
msgstr "Lås Hathor-wallet op"
561561

562562
#: src/components/WalletConnect/CreateTokenModal.js:60
563563
#: src/components/WalletConnect/NanoContract/NewNanoContractTransactionModal.js:64
564564
#: src/components/WalletConnect/SignMessageModal.js:72
565-
#: src/screens/PinScreen.js:296
565+
#: src/screens/PinScreen.js:300
566566
#: src/screens/WalletConnect/WalletConnectList.js:125
567567
msgid "Cancel"
568568
msgstr "Annuller"
569569

570-
#: src/screens/PinScreen.js:330 src/screens/PinScreen.js:334
570+
#: src/screens/PinScreen.js:334 src/screens/PinScreen.js:338
571571
msgid "Biometry failed or canceled."
572572
msgstr "Biometri mislykkedes eller blev annulleret."
573573

@@ -663,36 +663,36 @@ msgstr ""
663663
msgid "Reset Wallet"
664664
msgstr "Nulstil wallet"
665665

666-
#: src/screens/Security.js:120
666+
#: src/screens/Security.js:130
667667
msgid "Disable biometry"
668668
msgstr "Deaktiver biometri"
669669

670-
#: src/screens/Security.js:121
670+
#: src/screens/Security.js:131
671671
msgid "Disabling biometry"
672672
msgstr "Deaktiverer biometri"
673673

674-
#: src/screens/Security.js:133
674+
#: src/screens/Security.js:143
675675
msgid "Enter your 6-digit pin to enable biometry"
676676
msgstr "Indtast din 6-cifrede pin for at aktivere biometri"
677677

678-
#: src/screens/Security.js:144
678+
#: src/screens/Security.js:154
679679
msgid "No biometry supported"
680680
msgstr "Ingen biometri understøttet"
681681

682-
#: src/screens/Security.js:144
682+
#: src/screens/Security.js:154
683683
#, javascript-format
684684
msgid "Use ${ this.supportedBiometry }"
685685
msgstr "Brug ${ this.supportedBiometry }"
686686

687-
#: src/screens/Security.js:149
687+
#: src/screens/Security.js:159
688688
msgid "SECURITY"
689689
msgstr "SIKKERHED"
690690

691-
#: src/screens/Security.js:173
691+
#: src/screens/Security.js:183
692692
msgid "Change PIN"
693693
msgstr "Skift pinkode"
694694

695-
#: src/screens/Security.js:178
695+
#: src/screens/Security.js:188
696696
msgid "Lock wallet"
697697
msgstr "Lås wallet"
698698

@@ -973,7 +973,7 @@ msgstr ""
973973
msgid "Network Pre-Settings"
974974
msgstr ""
975975

976-
#: src/screens/NetworkSettings/NetworkPreSettingsScreen.js:127
976+
#: src/screens/NetworkSettings/NetworkPreSettingsScreen.js:131
977977
msgid "Customize"
978978
msgstr ""
979979

@@ -1138,21 +1138,21 @@ msgstr ""
11381138
msgid "Error loading the details of some tokens."
11391139
msgstr ""
11401140

1141-
#: src/sagas/wallet.js:780
1141+
#: src/sagas/wallet.js:804
11421142
msgid "Wallet is not ready to load addresses."
11431143
msgstr ""
11441144

11451145
#. This will show the message in the feedback content at SelectAddressModal
1146-
#: src/sagas/wallet.js:796
1146+
#: src/sagas/wallet.js:820
11471147
msgid "There was an error while loading wallet addresses. Try again."
11481148
msgstr ""
11491149

1150-
#: src/sagas/wallet.js:806
1150+
#: src/sagas/wallet.js:830
11511151
msgid "Wallet is not ready to load the first address."
11521152
msgstr ""
11531153

11541154
#. This will show the message in the feedback content
1155-
#: src/sagas/wallet.js:822
1155+
#: src/sagas/wallet.js:846
11561156
msgid "There was an error while loading first wallet address. Try again."
11571157
msgstr ""
11581158

‎locale/pt-br/texts.po

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ msgid "[Last] dddd [•] HH:mm"
5757
msgstr "[Última] dddd [•] HH:mm"
5858

5959
#. See https://momentjs.com/docs/#/displaying/calendar-time/
60-
#: src/models.js:107 src/utils.js:445
60+
#: src/models.js:107 src/utils.js:502
6161
msgid "DD MMM YYYY [•] HH:mm"
6262
msgstr "DD MMM YYYY [•] HH:mm"
6363

64-
#: src/utils.js:180
64+
#: src/utils.js:220
6565
msgid "Invalid address"
6666
msgstr "Endereço inválido"
6767

@@ -452,7 +452,7 @@ msgstr "Digite suas palavras separadas por espaços"
452452
#: src/components/WalletConnect/NanoContract/NewNanoContractTransactionRequest.js:295
453453
#: src/screens/LoadHistoryScreen.js:51 src/screens/LoadWalletErrorScreen.js:20
454454
#: src/screens/NanoContract/NanoContractRegisterScreen.js:168
455-
#: src/screens/PinScreen.js:271
455+
#: src/screens/PinScreen.js:274
456456
msgid "Try again"
457457
msgstr "Tente novamente"
458458

@@ -474,7 +474,7 @@ msgstr "**${ loadedData.addresses } endereços** encontrados"
474474
msgid "There's been an error connecting to the server."
475475
msgstr "Ocorreu um erro ao conectar com o servidor."
476476

477-
#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:299
477+
#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:303
478478
#: src/screens/Settings.js:161
479479
msgid "Reset wallet"
480480
msgstr "Resetar Wallet"
@@ -560,27 +560,27 @@ msgstr "Recebido"
560560
msgid "Waiting confirmation"
561561
msgstr "Aguardando confirmação"
562562

563-
#: src/screens/PinScreen.js:260
563+
#: src/screens/PinScreen.js:263
564564
msgid "Incorrect PIN Code. Try again."
565565
msgstr "PIN incorreto. Tente novamente."
566566

567-
#: src/screens/PinScreen.js:72
567+
#: src/screens/PinScreen.js:74
568568
msgid "Enter your PIN Code "
569569
msgstr "Digite seu PIN "
570570

571-
#: src/screens/PinScreen.js:73
571+
#: src/screens/PinScreen.js:75
572572
msgid "Unlock Hathor Wallet"
573573
msgstr "Desbloqueie sua Hathor Wallet"
574574

575575
#: src/components/WalletConnect/CreateTokenModal.js:60
576576
#: src/components/WalletConnect/NanoContract/NewNanoContractTransactionModal.js:64
577577
#: src/components/WalletConnect/SignMessageModal.js:72
578-
#: src/screens/PinScreen.js:296
578+
#: src/screens/PinScreen.js:300
579579
#: src/screens/WalletConnect/WalletConnectList.js:125
580580
msgid "Cancel"
581581
msgstr "Cancelar"
582582

583-
#: src/screens/PinScreen.js:330 src/screens/PinScreen.js:334
583+
#: src/screens/PinScreen.js:334 src/screens/PinScreen.js:338
584584
msgid "Biometry failed or canceled."
585585
msgstr "Biometria falhou ou foi cancelada."
586586

@@ -679,36 +679,36 @@ msgstr ""
679679
msgid "Reset Wallet"
680680
msgstr "Resetar Wallet"
681681

682-
#: src/screens/Security.js:120
682+
#: src/screens/Security.js:130
683683
msgid "Disable biometry"
684684
msgstr "Desativar biometria"
685685

686-
#: src/screens/Security.js:121
686+
#: src/screens/Security.js:131
687687
msgid "Disabling biometry"
688688
msgstr "Desativando biometria"
689689

690-
#: src/screens/Security.js:133
690+
#: src/screens/Security.js:143
691691
msgid "Enter your 6-digit pin to enable biometry"
692692
msgstr "Digite seu PIN de 6 dígitos para habilitar biometria"
693693

694-
#: src/screens/Security.js:144
694+
#: src/screens/Security.js:154
695695
msgid "No biometry supported"
696696
msgstr "Nenhuma biometria suportada"
697697

698-
#: src/screens/Security.js:144
698+
#: src/screens/Security.js:154
699699
#, javascript-format
700700
msgid "Use ${ this.supportedBiometry }"
701701
msgstr "Usar ${ this.supportedBiometry }"
702702

703-
#: src/screens/Security.js:149
703+
#: src/screens/Security.js:159
704704
msgid "SECURITY"
705705
msgstr "SEGURANÇA"
706706

707-
#: src/screens/Security.js:173
707+
#: src/screens/Security.js:183
708708
msgid "Change PIN"
709709
msgstr "Mudar PIN"
710710

711-
#: src/screens/Security.js:178
711+
#: src/screens/Security.js:188
712712
msgid "Lock wallet"
713713
msgstr "Bloquear a wallet"
714714

@@ -998,7 +998,7 @@ msgstr "Wallet Service WS URL (opcional)"
998998
msgid "Network Pre-Settings"
999999
msgstr "Pré-Configurações de Rede"
10001000

1001-
#: src/screens/NetworkSettings/NetworkPreSettingsScreen.js:127
1001+
#: src/screens/NetworkSettings/NetworkPreSettingsScreen.js:131
10021002
msgid "Customize"
10031003
msgstr "Personalizar"
10041004

@@ -1167,21 +1167,21 @@ msgstr "A wallet não está pronta ainda."
11671167
msgid "Error loading the details of some tokens."
11681168
msgstr "Ocorreu um erro durante o carregamento de detalhes de alguns tokens."
11691169

1170-
#: src/sagas/wallet.js:780
1170+
#: src/sagas/wallet.js:804
11711171
msgid "Wallet is not ready to load addresses."
11721172
msgstr "A wallet não está pronta para carregar os endereços."
11731173

11741174
#. This will show the message in the feedback content at SelectAddressModal
1175-
#: src/sagas/wallet.js:796
1175+
#: src/sagas/wallet.js:820
11761176
msgid "There was an error while loading wallet addresses. Try again."
11771177
msgstr "Ocorreu um erro ao carregar os endereços da wallet. Tente novamente."
11781178

1179-
#: src/sagas/wallet.js:806
1179+
#: src/sagas/wallet.js:830
11801180
msgid "Wallet is not ready to load the first address."
11811181
msgstr "A wallet não está pronta para carregar o primeiro endereço."
11821182

11831183
#. This will show the message in the feedback content
1184-
#: src/sagas/wallet.js:822
1184+
#: src/sagas/wallet.js:846
11851185
msgid "There was an error while loading first wallet address. Try again."
11861186
msgstr ""
11871187
"Ocorreu um erro ao carregar o primeiro endereço da wallet. Tente novamente."

0 commit comments

Comments
 (0)