Skip to content

Commit

Permalink
Merge branch 'release/wallet-mobile/v4.27.0' into fix/wallet-list-spa…
Browse files Browse the repository at this point in the history 
…cing

Signed-off-by: banklesss <105349292+banklesss@users.noreply.github.com>
  • Loading branch information
@banklesss
banklesss committed Apr 16, 2024
2 parents 0824ca1 + b4c9dca commit c2a8a8c
Show file tree
Hide file tree
Showing 13 changed files with 111 additions and 106 deletions.
2 changes: 1 addition & 1 deletion apps/wallet-mobile/android/app/build.gradle
View file
Expand Up @@ -108,7 +108,7 @@ android {
applicationId "com.emurgo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 641
versionCode 642
versionName "4.27.0"
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet-mobile/ios/nightly.plist
View file
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>528</string>
<string>529</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down
8 changes: 4 additions & 4 deletions apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
View file
Expand Up @@ -839,7 +839,7 @@
CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 528;
CURRENT_PROJECT_VERSION = 529;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -884,7 +884,7 @@
CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 528;
CURRENT_PROJECT_VERSION = 529;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
ENVFILE = "$(PODS_ROOT)/../../.env.production";
Expand Down Expand Up @@ -1079,7 +1079,7 @@
CODE_SIGN_ENTITLEMENTS = nightly.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 528;
CURRENT_PROJECT_VERSION = 529;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1124,7 +1124,7 @@
CODE_SIGN_ENTITLEMENTS = nightly.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 528;
CURRENT_PROJECT_VERSION = 529;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet-mobile/ios/yoroi/Info.plist
View file
Expand Up @@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>528</string>
<string>529</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet-mobile/ios/yoroiTests/Info.plist
View file
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>528</string>
<string>529</string>
</dict>
</plist>
30 changes: 18 additions & 12 deletions apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx
View file
Expand Up @@ -37,19 +37,25 @@ export const AddWalletNavigator = () => {
<Stack.Screen
name="setup-wallet-choose-setup-type"
component={ChooseSetupTypeScreen}
options={{title: strings.addWalletTitle}}
options={{title: strings.addNewWalletTitle}}
/>

<Stack.Screen
name="setup-wallet-choose-network"
name="setup-wallet-create-choose-network"
component={ChooseNetworkScreen}
options={{title: strings.addWalletTitle}}
options={{title: strings.createWalletTitle}}
/>

<Stack.Screen
name="setup-wallet-choose-mnemonic-type"
name="setup-wallet-restore-choose-network"
component={ChooseNetworkScreen}
options={{title: strings.restoreWalletTitle}}
/>

<Stack.Screen
name="setup-wallet-restore-choose-mnemonic-type"
component={ChooseMnemonicTypeScreen}
options={{title: strings.addWalletTitle}}
options={{title: strings.restoreWalletTitle}}
/>

<Stack.Screen
Expand Down Expand Up @@ -108,19 +114,19 @@ export const AddWalletNavigator = () => {
<Stack.Screen //
name="setup-wallet-about-recovery-phase"
component={AboutRecoveryPhraseScreen}
options={{title: strings.mnemonicShowTitle}}
options={{title: strings.createWalletTitle}}
/>

<Stack.Screen
name="setup-wallet-recovery-phrase-mnemonic"
component={RecoveryPhraseScreen}
options={{title: strings.mnemonicShowTitle}}
options={{title: strings.createWalletTitle}}
/>

<Stack.Screen
name="setup-wallet-verify-recovery-phrase-mnemonic"
component={VerifyRecoveryPhraseScreen}
options={{title: strings.mnemonicCheckTitle}}
options={{title: strings.createWalletTitle}}
/>
</Stack.Navigator>
)
Expand All @@ -129,13 +135,13 @@ export const AddWalletNavigator = () => {
const ConnectNanoXScreenWrapper = () => <ConnectNanoXScreen />

const messages = defineMessages({
addWalletTitle: {
addNewWalletTitle: {
id: 'components.walletinit.walletinitscreen.title',
defaultMessage: '!!!Add wallet',
defaultMessage: '!!!Add new wallet',
},
createWalletTitle: {
id: 'components.walletinit.createwallet.createwalletscreen.title',
defaultMessage: '!!!Create a new wallet',
defaultMessage: '!!!Create wallet',
},
restoreWalletTitle: {
id: 'components.walletinit.restorewallet.restorewalletscreen.title',
Expand Down Expand Up @@ -183,7 +189,7 @@ const useStrings = () => {
const intl = useIntl()

return {
addWalletTitle: intl.formatMessage(messages.addWalletTitle),
addNewWalletTitle: intl.formatMessage(messages.addNewWalletTitle),
createWalletTitle: intl.formatMessage(messages.createWalletTitle),
restoreWalletTitle: intl.formatMessage(messages.restoreWalletTitle),
importReadOnlyTitle: intl.formatMessage(messages.importReadOnlyTitle),
Expand Down
7 changes: 1 addition & 6 deletions apps/wallet-mobile/src/features/SetupWallet/common/MnemonicInput/MnemonicInput.tsx
View file
Expand Up @@ -167,7 +167,6 @@ const MnemonicWordInput = React.forwardRef<RNTextInput, MnemonicWordInputProps>(
const dateTime = React.useRef<number>()
const [error, setError] = React.useState('')
const [matchingWords, setMatchingWords] = React.useState<Array<string>>([])
const [wordSubmitted, setWordSubmitted] = React.useState(false)

const selectWord = React.useCallback(
(matchingWord: string) => {
Expand All @@ -183,16 +182,13 @@ const MnemonicWordInput = React.forwardRef<RNTextInput, MnemonicWordInputProps>(
)

const onSubmitEditing = React.useCallback(() => {
setWordSubmitted(true)
if (!isEmptyString(matchingWords[0])) {
selectWord(matchingWords[0])
}
}, [matchingWords, selectWord])

const onChangeText = React.useCallback(
(text: string) => {
if (wordSubmitted) return // to fix ios simulator issue

if (text.endsWith(' ')) {
text = text.trimEnd()
setWord(normalizeText(text))
Expand All @@ -210,7 +206,7 @@ const MnemonicWordInput = React.forwardRef<RNTextInput, MnemonicWordInputProps>(
} else if (error !== '') setError('')
} else setMatchingWords([])
},
[error, onSubmitEditing, wordSubmitted],
[error, onSubmitEditing],
)

React.useEffect(() => {
Expand All @@ -236,7 +232,6 @@ const MnemonicWordInput = React.forwardRef<RNTextInput, MnemonicWordInputProps>(
})
}

setWordSubmitted(false)
onFocus()
}}
onChange={() => {
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseNetwork/ChooseNetworkScreen.tsx
View file
Expand Up @@ -96,7 +96,7 @@ export const useNavigateTo = () => {
return React.useRef({
create: () => navigation.navigate('setup-wallet-about-recovery-phase'),
restore: () => navigation.navigate('setup-wallet-restore-form'),
mnemonicType: () => navigation.navigate('setup-wallet-choose-mnemonic-type'),
mnemonicType: () => navigation.navigate('setup-wallet-restore-choose-mnemonic-type'),
hw: () => navigation.navigate('setup-wallet-check-nano-x'),
}).current
}
Expand Down
11 changes: 7 additions & 4 deletions ...wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx
View file
Expand Up @@ -42,19 +42,21 @@ export const ChooseSetupTypeScreen = () => {
return
}

navigation.navigate('setup-wallet-choose-network')
// On production the step of network is skipped
navigation.navigate('setup-wallet-create-choose-network')
}

const handleRestore = () => {
setUpTypeChanged('restore')

if (isProduction()) {
networkIdChanged(HASKELL_SHELLEY.NETWORK_ID)
navigation.navigate('setup-wallet-choose-mnemonic-type')
navigation.navigate('setup-wallet-restore-choose-mnemonic-type')
return
}

navigation.navigate('setup-wallet-choose-network')
// On production the step of network is skipped
navigation.navigate('setup-wallet-restore-choose-network')
}

const handleHw = () => {
Expand All @@ -71,7 +73,8 @@ export const ChooseSetupTypeScreen = () => {
return
}

navigation.navigate('setup-wallet-choose-network')
// On production the step of network is skipped
navigation.navigate('setup-wallet-restore-choose-network')
}

return (
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet-mobile/src/i18n/locales/en-US.json
View file
Expand Up @@ -561,7 +561,7 @@
"components.walletinit.createwallet.createwalletscreen.passwordLengthRequirement": "Minimum {requiredPasswordLength} characters",
"components.walletinit.createwallet.createwalletscreen.notFound": "Not found",
"components.walletinit.createwallet.createwalletscreen.clearAll": "Clear all",
"components.walletinit.createwallet.createwalletscreen.title": "Create a new wallet",
"components.walletinit.createwallet.createwalletscreen.title": "Create wallet",
"components.walletinit.createwallet.mnemonicbackupimportancemodal.confirmationButton": "I understand",
"components.walletinit.createwallet.mnemonicbackupimportancemodal.keysStorageCheckbox": "I understand that my secret keys are held securely on this device only, not on the company`s servers",
"components.walletinit.createwallet.mnemonicbackupimportancemodal.newDeviceRecoveryCheckbox": "I understand that if this application is moved to another device or deleted, my funds can be only recovered with the backup phrase that I have written down and saved in a secure place.",
Expand Down Expand Up @@ -635,7 +635,7 @@
"components.walletinit.walletinitscreen.restoreNWordWalletExplanation": "If you have a recovery phrase consisting of {mnemonicLength} words, choose this option to restore your wallet.",
"components.walletinit.walletinitscreen.restoreShelleyWalletButton": "Restore wallet (Shelley Testnet)",
"components.walletinit.walletinitscreen.restoreWalletButton": "Restore wallet",
"components.walletinit.walletinitscreen.title": "Add wallet",
"components.walletinit.walletinitscreen.title": "Add new wallet",
"components.walletselection.walletselectionscreen.addWalletButton": "Add wallet",
"components.walletselection.walletselectionscreen.addWalletOnShelleyButton": "Add wallet (Jormungandr ITN)",
"components.walletselection.walletselectionscreen.header": "My wallets",
Expand Down
5 changes: 3 additions & 2 deletions apps/wallet-mobile/src/navigation.tsx
View file
Expand Up @@ -115,8 +115,9 @@ export type WalletStackRouteNavigation = StackNavigationProp<WalletStackRoutes>

export type WalletInitRoutes = {
'setup-wallet-choose-setup-type': undefined
'setup-wallet-choose-network': undefined
'setup-wallet-choose-mnemonic-type': undefined
'setup-wallet-create-choose-network': undefined
'setup-wallet-restore-choose-network': undefined
'setup-wallet-restore-choose-mnemonic-type': undefined
'initial-setup-wallet-choose-setup-type': undefined
'setup-wallet-details-form': undefined
'setup-wallet-restore-form': undefined
Expand Down

0 comments on commit c2a8a8c

Please sign in to comment.