diff --git a/src/desktop/src/ui/components/modal/Password.js b/src/desktop/src/ui/components/modal/Password.js index c0e7d29b52..1bfd5e01ab 100644 --- a/src/desktop/src/ui/components/modal/Password.js +++ b/src/desktop/src/ui/components/modal/Password.js @@ -188,7 +188,4 @@ const mapDispatchToProps = { generateAlert, }; -export default connect( - null, - mapDispatchToProps, -)(withI18n()(ModalPassword)); +export default connect(null, mapDispatchToProps)(withI18n()(ModalPassword)); diff --git a/src/desktop/src/ui/global/Idle.js b/src/desktop/src/ui/global/Idle.js index 80de89172a..7af3a235d7 100644 --- a/src/desktop/src/ui/global/Idle.js +++ b/src/desktop/src/ui/global/Idle.js @@ -102,7 +102,4 @@ const mapDispatchToProps = { setPassword, }; -export default connect( - mapStateToProps, - mapDispatchToProps, -)(Idle); +export default connect(mapStateToProps, mapDispatchToProps)(Idle); diff --git a/src/mobile/package.json b/src/mobile/package.json index 61a73c0fb3..cd518336d0 100644 --- a/src/mobile/package.json +++ b/src/mobile/package.json @@ -213,4 +213,4 @@ "tls": false }, "snyk": true -} +} \ No newline at end of file diff --git a/src/mobile/src/ui/components/MultiTextInput.js b/src/mobile/src/ui/components/MultiTextInput.js index 7d94dd5923..6bd9cfc834 100644 --- a/src/mobile/src/ui/components/MultiTextInput.js +++ b/src/mobile/src/ui/components/MultiTextInput.js @@ -187,7 +187,7 @@ class MultiTextInput extends Component { {selectedTab === 'amount' && ( - - - + + + + ); diff --git a/src/mobile/src/ui/routes/entry.js b/src/mobile/src/ui/routes/entry.js index bd7f75e25d..c391c1b5b8 100644 --- a/src/mobile/src/ui/routes/entry.js +++ b/src/mobile/src/ui/routes/entry.js @@ -63,6 +63,24 @@ const onAppStart = () => { }; const renderInitialScreen = (initialScreen, state, store) => { + Navigation.setDefaultOptions({ + layout: { + backgroundColor: state.settings.theme.body.bg, + orientation: ['portrait'], + }, + topBar: { + visible: false, + drawBehind: false, + elevation: 0, + background: { + color: 'black', + }, + }, + statusBar: { + drawBehind: false, + backgroundColor: state.settings.theme.body.bg, + }, + }); Navigation.setRoot({ root: { stack: { @@ -71,24 +89,6 @@ const renderInitialScreen = (initialScreen, state, store) => { { component: { name: initialScreen, - options: { - layout: { - backgroundColor: state.settings.theme.body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, - background: { - color: state.settings.theme.body.bg, - }, - }, - statusBar: { - drawBehind: false, - backgroundColor: state.settings.theme.body.bg, - }, - }, }, }, ], diff --git a/src/mobile/src/ui/views/onboarding/EnterSeed.js b/src/mobile/src/ui/views/onboarding/EnterSeed.js index 6ce41f7456..cf643246e8 100644 --- a/src/mobile/src/ui/views/onboarding/EnterSeed.js +++ b/src/mobile/src/ui/views/onboarding/EnterSeed.js @@ -138,15 +138,8 @@ class EnterSeed extends React.Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/LanguageSetup.js b/src/mobile/src/ui/views/onboarding/LanguageSetup.js index 709a9bd23f..d65556a27e 100644 --- a/src/mobile/src/ui/views/onboarding/LanguageSetup.js +++ b/src/mobile/src/ui/views/onboarding/LanguageSetup.js @@ -95,15 +95,8 @@ class LanguageSetup extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: !acceptedTerms || !acceptedPrivacy ? bar.bg : body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/NewSeedSetup.js b/src/mobile/src/ui/views/onboarding/NewSeedSetup.js index d5b6a15b9b..1a00cf55e4 100644 --- a/src/mobile/src/ui/views/onboarding/NewSeedSetup.js +++ b/src/mobile/src/ui/views/onboarding/NewSeedSetup.js @@ -173,18 +173,13 @@ class NewSeedSetup extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], }, topBar: { - visible: false, - drawBehind: false, - elevation: 0, title: { color: body.color, }, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/OnboardingComplete.js b/src/mobile/src/ui/views/onboarding/OnboardingComplete.js index 0ca0606919..55a703f1be 100644 --- a/src/mobile/src/ui/views/onboarding/OnboardingComplete.js +++ b/src/mobile/src/ui/views/onboarding/OnboardingComplete.js @@ -80,15 +80,8 @@ class OnboardingComplete extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/PrivacyPolicy.js b/src/mobile/src/ui/views/onboarding/PrivacyPolicy.js index d581a52930..f84f43f96b 100644 --- a/src/mobile/src/ui/views/onboarding/PrivacyPolicy.js +++ b/src/mobile/src/ui/views/onboarding/PrivacyPolicy.js @@ -99,15 +99,8 @@ class PrivacyPolicy extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/SaveSeedConfirmation.js b/src/mobile/src/ui/views/onboarding/SaveSeedConfirmation.js index a833227017..3d6196a629 100644 --- a/src/mobile/src/ui/views/onboarding/SaveSeedConfirmation.js +++ b/src/mobile/src/ui/views/onboarding/SaveSeedConfirmation.js @@ -102,15 +102,8 @@ class SaveSeedConfirmation extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/SaveYourSeed.js b/src/mobile/src/ui/views/onboarding/SaveYourSeed.js index 2bcca18ee4..6f800941c7 100644 --- a/src/mobile/src/ui/views/onboarding/SaveYourSeed.js +++ b/src/mobile/src/ui/views/onboarding/SaveYourSeed.js @@ -122,15 +122,8 @@ class SaveYourSeed extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); @@ -161,15 +154,8 @@ class SaveYourSeed extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); @@ -196,15 +182,8 @@ class SaveYourSeed extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/SeedReentry.js b/src/mobile/src/ui/views/onboarding/SeedReentry.js index 902e0624a5..ac7ad73552 100644 --- a/src/mobile/src/ui/views/onboarding/SeedReentry.js +++ b/src/mobile/src/ui/views/onboarding/SeedReentry.js @@ -121,15 +121,8 @@ class SeedReentry extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); @@ -190,7 +183,6 @@ class SeedReentry extends Component { case 'qrScanner': return this.props.toggleModalActivity(modalContent, { theme, - print: () => this.print(), hideModal: () => this.props.toggleModalActivity(), onQRRead: (data) => this.onQRRead(data), }); diff --git a/src/mobile/src/ui/views/onboarding/SetAccountName.js b/src/mobile/src/ui/views/onboarding/SetAccountName.js index 01dd4b105d..aac6f917a2 100644 --- a/src/mobile/src/ui/views/onboarding/SetAccountName.js +++ b/src/mobile/src/ui/views/onboarding/SetAccountName.js @@ -178,15 +178,8 @@ export class SetAccountName extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/SetPassword.js b/src/mobile/src/ui/views/onboarding/SetPassword.js index 54d08fac55..0388eea5e7 100644 --- a/src/mobile/src/ui/views/onboarding/SetPassword.js +++ b/src/mobile/src/ui/views/onboarding/SetPassword.js @@ -157,15 +157,8 @@ class SetPassword extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/TermsAndConditions.js b/src/mobile/src/ui/views/onboarding/TermsAndConditions.js index b22db55b3c..56f5517edc 100644 --- a/src/mobile/src/ui/views/onboarding/TermsAndConditions.js +++ b/src/mobile/src/ui/views/onboarding/TermsAndConditions.js @@ -104,15 +104,8 @@ class TermsAndConditions extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: bar.bg, }, }); diff --git a/src/mobile/src/ui/views/onboarding/WalletSetup.js b/src/mobile/src/ui/views/onboarding/WalletSetup.js index 0860549d88..036fe2b4ee 100644 --- a/src/mobile/src/ui/views/onboarding/WalletSetup.js +++ b/src/mobile/src/ui/views/onboarding/WalletSetup.js @@ -108,15 +108,8 @@ class WalletSetup extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/AddNewAccount.js b/src/mobile/src/ui/views/wallet/AddNewAccount.js index bd9aee1701..3f2c72b67b 100644 --- a/src/mobile/src/ui/views/wallet/AddNewAccount.js +++ b/src/mobile/src/ui/views/wallet/AddNewAccount.js @@ -58,15 +58,8 @@ class AddNewAccount extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/AdvancedSettings.js b/src/mobile/src/ui/views/wallet/AdvancedSettings.js index 443a95728a..bba0fd9a68 100644 --- a/src/mobile/src/ui/views/wallet/AdvancedSettings.js +++ b/src/mobile/src/ui/views/wallet/AdvancedSettings.js @@ -109,15 +109,8 @@ export class AdvancedSettings extends PureComponent { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/ForceChangePassword.js b/src/mobile/src/ui/views/wallet/ForceChangePassword.js index bd3b1142e3..e123b10db4 100644 --- a/src/mobile/src/ui/views/wallet/ForceChangePassword.js +++ b/src/mobile/src/ui/views/wallet/ForceChangePassword.js @@ -175,15 +175,8 @@ class ForceChangePassword extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/Loading.js b/src/mobile/src/ui/views/wallet/Loading.js index 0cb650088b..c9309debd4 100644 --- a/src/mobile/src/ui/views/wallet/Loading.js +++ b/src/mobile/src/ui/views/wallet/Loading.js @@ -155,7 +155,7 @@ class Loading extends Component { password, deepLinkActive, } = this.props; - + this.props.setLoginRoute('login'); leaveNavigationBreadcrumb('Loading'); KeepAwake.activate(); this.animation.play(); @@ -293,15 +293,8 @@ class Loading extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); @@ -322,15 +315,8 @@ class Loading extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: bar.alt, }, }); diff --git a/src/mobile/src/ui/views/wallet/Login.js b/src/mobile/src/ui/views/wallet/Login.js index 14d0a4ccd4..ea458c52b8 100644 --- a/src/mobile/src/ui/views/wallet/Login.js +++ b/src/mobile/src/ui/views/wallet/Login.js @@ -162,7 +162,6 @@ class Login extends Component { const verified = authenticator.verifyToken(key, token); if (verified) { this.navigateToLoading(); - this.props.setLoginRoute('login'); } else { this.props.generateAlert('error', t('twoFA:wrongCode'), t('twoFA:wrongCodeExplanation')); } @@ -227,15 +226,8 @@ class Login extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: true, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/MainSettings.js b/src/mobile/src/ui/views/wallet/MainSettings.js index 908aa4ab0f..5fb3bec715 100644 --- a/src/mobile/src/ui/views/wallet/MainSettings.js +++ b/src/mobile/src/ui/views/wallet/MainSettings.js @@ -88,15 +88,8 @@ export class MainSettings extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/SecuritySettings.js b/src/mobile/src/ui/views/wallet/SecuritySettings.js index f68ecfdcd2..072551887c 100644 --- a/src/mobile/src/ui/views/wallet/SecuritySettings.js +++ b/src/mobile/src/ui/views/wallet/SecuritySettings.js @@ -50,15 +50,8 @@ class SecuritySettings extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); @@ -81,15 +74,8 @@ class SecuritySettings extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/TwoFactorSetupAddKey.js b/src/mobile/src/ui/views/wallet/TwoFactorSetupAddKey.js index 19f5f442ab..930c4bde15 100644 --- a/src/mobile/src/ui/views/wallet/TwoFactorSetupAddKey.js +++ b/src/mobile/src/ui/views/wallet/TwoFactorSetupAddKey.js @@ -136,15 +136,8 @@ export class TwoFactorSetupAddKey extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/TwoFactorSetupEnterToken.js b/src/mobile/src/ui/views/wallet/TwoFactorSetupEnterToken.js index 57cf171ae9..2223ef4a3c 100644 --- a/src/mobile/src/ui/views/wallet/TwoFactorSetupEnterToken.js +++ b/src/mobile/src/ui/views/wallet/TwoFactorSetupEnterToken.js @@ -108,15 +108,8 @@ class TwoFactorSetupEnterToken extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: bar.alt, }, }); diff --git a/src/mobile/src/ui/views/wallet/UseExistingSeed.js b/src/mobile/src/ui/views/wallet/UseExistingSeed.js index e43027eb55..fbe0a800f1 100644 --- a/src/mobile/src/ui/views/wallet/UseExistingSeed.js +++ b/src/mobile/src/ui/views/wallet/UseExistingSeed.js @@ -178,15 +178,8 @@ class UseExistingSeed extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); @@ -286,6 +279,22 @@ class UseExistingSeed extends Component { {t('useExistingSeed:title')} + { + this.accountNameField = c; + }} + label={t('addAdditionalSeed:accountName')} + onChangeText={(value) => this.setState({ accountName: value })} + containerStyle={{ width: Styling.contentWidth }} + autoCapitalize="words" + maxLength={MAX_SEED_LENGTH} + autoCorrect={false} + enablesReturnKeyAutomatically + returnKeyType="done" + theme={theme} + value={accountName} + /> + { @@ -321,22 +330,6 @@ class UseExistingSeed extends Component { this.SeedVaultImport = ref; }} /> - - { - this.accountNameField = c; - }} - label={t('addAdditionalSeed:accountName')} - onChangeText={(value) => this.setState({ accountName: value })} - containerStyle={{ width: Styling.contentWidth }} - autoCapitalize="words" - maxLength={MAX_SEED_LENGTH} - autoCorrect={false} - enablesReturnKeyAutomatically - returnKeyType="done" - theme={theme} - value={accountName} - /> diff --git a/src/mobile/src/ui/views/wallet/WalletResetConfirmation.js b/src/mobile/src/ui/views/wallet/WalletResetConfirmation.js index 1a1791c31f..1a4afe7d68 100644 --- a/src/mobile/src/ui/views/wallet/WalletResetConfirmation.js +++ b/src/mobile/src/ui/views/wallet/WalletResetConfirmation.js @@ -103,15 +103,8 @@ class WalletResetConfirmation extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/src/ui/views/wallet/WalletResetRequirePassword.js b/src/mobile/src/ui/views/wallet/WalletResetRequirePassword.js index df1efd50fe..ecacda5e4e 100644 --- a/src/mobile/src/ui/views/wallet/WalletResetRequirePassword.js +++ b/src/mobile/src/ui/views/wallet/WalletResetRequirePassword.js @@ -123,15 +123,8 @@ class WalletResetRequirePassword extends Component { }, layout: { backgroundColor: body.bg, - orientation: ['portrait'], - }, - topBar: { - visible: false, - drawBehind: false, - elevation: 0, }, statusBar: { - drawBehind: false, backgroundColor: body.bg, }, }); diff --git a/src/mobile/yarn.lock b/src/mobile/yarn.lock index 199dc027ab..9a69a630aa 100644 --- a/src/mobile/yarn.lock +++ b/src/mobile/yarn.lock @@ -6997,9 +6997,10 @@ react-native-markdown-renderer@^3.2.1: prop-types "^15.5.10" react-native-fit-image "^1.5.2" -"react-native-modal-translucent@https://github.com/listenzz/react-native-modal-translucent": +react-native-modal-translucent@^1.1.3: version "1.1.7" - resolved "https://github.com/listenzz/react-native-modal-translucent#87942974c2d4b1b405bd08069bcb35d8fdb19959" + resolved "https://registry.yarnpkg.com/react-native-modal-translucent/-/react-native-modal-translucent-1.1.7.tgz#ca2599c0090a7b764c1044a03a13d44e83c95edd" + integrity sha512-HMH76pMO+yg55xubjboqlr6TFWo5fHSZtyBBllDPiKcaECrd9Q/gpD/flaFRxgx3Cd8QPLiMh270SBpEDBs1fQ== react-native-modal@^7.0.1: version "7.0.1" diff --git a/src/shared/locales/en/translation.json b/src/shared/locales/en/translation.json index c1eb72b118..f34a6055dc 100644 --- a/src/shared/locales/en/translation.json +++ b/src/shared/locales/en/translation.json @@ -579,7 +579,7 @@ "syncingYourAccount": "Syncing your account." }, "useExistingSeed": { - "title": "Enter a seed and account name.", + "title": "Enter an account name and seed", "incorrectFormat": "Incorrect seed format", "validSeedExplanation": "Valid seeds should be 81 characters and contain only A-Z or 9." },