Merge pull request #2626 from BlueWallet/limpbrains-screen-titles

FIX: screen titles language
This commit is contained in:
GLaDOS 2021-02-18 13:21:11 +00:00 committed by GitHub
commit 3be3f34bba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 179 additions and 216 deletions

View File

@ -526,8 +526,10 @@ Browser.propTypes = {
}),
};
Browser.navigationOptions = navigationStyle({
closeButton: true,
title: loc.wallets.list_ln_browser,
headerLeft: null,
});
Browser.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.wallets.list_ln_browser }),
);

View File

@ -497,8 +497,10 @@ const styles = StyleSheet.create({
export default LNDCreateInvoice;
LNDCreateInvoice.navigationOptions = navigationStyle({
closeButton: true,
headerTitle: loc.receive.header,
headerLeft: null,
});
LNDCreateInvoice.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.receive.header }),
);

View File

@ -116,6 +116,7 @@ const styles = StyleSheet.create({
export default LNDViewAdditionalInvoiceInformation;
LNDViewAdditionalInvoiceInformation.navigationOptions = navigationStyle({
LNDViewAdditionalInvoiceInformation.navigationOptions = navigationStyle({}, opts => ({
...opts,
title: loc.lndViewInvoice.additional_info,
});
}));

View File

@ -61,6 +61,4 @@ const styles = StyleSheet.create({
export default LNDViewAdditionalInvoicePreImage;
LNDViewAdditionalInvoicePreImage.navigationOptions = navigationStyle({
title: loc.lndViewInvoice.additional_info,
});
LNDViewAdditionalInvoicePreImage.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.lndViewInvoice.additional_info }));

View File

@ -359,7 +359,6 @@ const styles = StyleSheet.create({
LNDViewInvoice.navigationOptions = navigationStyle(
{
title: loc.lndViewInvoice.lightning_invoice,
closeButton: true,
closeButtonFunc: ({ navigation }) => navigation.dangerouslyGetParent().pop(),
},
@ -377,6 +376,7 @@ LNDViewInvoice.navigationOptions = navigationStyle(
return {
...options,
...additionalOptions,
title: loc.lndViewInvoice.lightning_invoice,
};
},
);

View File

@ -356,11 +356,13 @@ const ScanLndInvoice = () => {
};
export default ScanLndInvoice;
ScanLndInvoice.navigationOptions = navigationStyle({
closeButton: true,
title: loc.send.header,
headerLeft: null,
});
ScanLndInvoice.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.send.header }),
);
const styles = StyleSheet.create({
walletSelectRoot: {

View File

@ -184,6 +184,4 @@ AztecoRedeem.propTypes = {
}),
};
AztecoRedeem.navigationOptions = navigationStyleTx({
title: loc.azteco.title,
});
AztecoRedeem.navigationOptions = navigationStyleTx({}, opts => ({ ...opts, title: loc.azteco.title }));

View File

@ -383,10 +383,12 @@ const ReceiveDetails = () => {
);
};
ReceiveDetails.navigationOptions = navigationStyle({
closeButton: true,
title: loc.receive.header,
headerLeft: null,
});
ReceiveDetails.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.receive.header }),
);
export default ReceiveDetails;

View File

@ -65,7 +65,9 @@ export default class Selftest extends Component {
if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') {
const aezeed = new HDAezeedWallet();
aezeed.setSecret('abstract rhythm weird food attract treat mosquito sight royal actor surround ride strike remove guilt catch filter summer mushroom protect poverty cruel chaos pattern');
aezeed.setSecret(
'abstract rhythm weird food attract treat mosquito sight royal actor surround ride strike remove guilt catch filter summer mushroom protect poverty cruel chaos pattern',
);
assertStrictEqual(await aezeed.validateMnemonicAsync(), true, 'Aezeed failed');
assertStrictEqual(aezeed._getExternalAddressByIndex(0), 'bc1qdjj7lhj9lnjye7xq3dzv3r4z0cta294xy78txn', 'Aezeed failed');
} else {

View File

@ -132,9 +132,7 @@ const Broadcast = () => {
};
export default Broadcast;
Broadcast.navigationOptions = navigationStyle({
title: loc.send.create_broadcast,
});
Broadcast.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.send.create_broadcast }));
const styles = StyleSheet.create({
wrapper: {

View File

@ -476,8 +476,6 @@ const styles = StyleSheet.create({
},
});
CoinControl.navigationOptions = navigationStyle({
title: loc.cc.header,
});
CoinControl.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.cc.header }));
export default CoinControl;

View File

@ -326,6 +326,4 @@ Confirm.propTypes = {
}),
};
Confirm.navigationOptions = navigationStyle({
title: loc.send.confirm_header,
});
Confirm.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.send.confirm_header }));

View File

@ -252,25 +252,21 @@ SendCreate.propTypes = {
}),
};
SendCreate.navigationOptions = navigationStyle(
{
title: loc.send.create_details,
},
(options, { theme, navigation, route }) => {
let headerRight;
if (route.params.exportTXN) {
headerRight = () => (
<TouchableOpacity style={styles.export} onPress={route.params.exportTXN}>
<Icon size={22} name="share-alternative" type="entypo" color={BlueCurrentTheme.colors.foregroundColor} />
</TouchableOpacity>
);
} else {
headerRight = null;
}
SendCreate.navigationOptions = navigationStyle({}, (options, { theme, navigation, route }) => {
let headerRight;
if (route.params.exportTXN) {
headerRight = () => (
<TouchableOpacity style={styles.export} onPress={route.params.exportTXN}>
<Icon size={22} name="share-alternative" type="entypo" color={BlueCurrentTheme.colors.foregroundColor} />
</TouchableOpacity>
);
} else {
headerRight = null;
}
return {
...options,
headerRight,
};
},
);
return {
...options,
headerRight,
title: loc.send.create_details,
};
});

View File

@ -1517,28 +1517,24 @@ SendDetails.propTypes = {
}),
};
SendDetails.navigationOptions = navigationStyleTx(
{
SendDetails.navigationOptions = navigationStyleTx({}, (options, { theme, navigation, route }) => {
let headerRight;
if (route.params.withAdvancedOptionsMenuButton) {
headerRight = () => (
<TouchableOpacity
style={styles.advancedOptions}
onPress={route.params.advancedOptionsMenuButtonAction}
testID="advancedOptionsMenuButton"
>
<Icon size={22} name="kebab-horizontal" type="octicon" color={theme.colors.foregroundColor} />
</TouchableOpacity>
);
} else {
headerRight = null;
}
return {
...options,
headerRight,
title: loc.send.header,
},
(options, { theme, navigation, route }) => {
let headerRight;
if (route.params.withAdvancedOptionsMenuButton) {
headerRight = () => (
<TouchableOpacity
style={styles.advancedOptions}
onPress={route.params.advancedOptionsMenuButtonAction}
testID="advancedOptionsMenuButton"
>
<Icon size={22} name="kebab-horizontal" type="octicon" color={theme.colors.foregroundColor} />
</TouchableOpacity>
);
} else {
headerRight = null;
}
return {
...options,
headerRight,
};
},
);
};
});

View File

@ -113,9 +113,7 @@ const IsItMyAddress = () => {
};
export default IsItMyAddress;
IsItMyAddress.navigationOptions = navigationStyle({
title: loc.is_it_my_address.title,
});
IsItMyAddress.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.is_it_my_address.title }));
const styles = StyleSheet.create({
wrapper: {

View File

@ -408,8 +408,6 @@ const styles = StyleSheet.create({
},
});
PsbtMultisig.navigationOptions = navigationStyle({
title: loc.multisig.header,
});
PsbtMultisig.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.multisig.header }));
export default PsbtMultisig;

View File

@ -120,8 +120,6 @@ const styles = StyleSheet.create({
},
});
PsbtMultisigQRCode.navigationOptions = navigationStyle({
title: loc.multisig.header,
});
PsbtMultisigQRCode.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.multisig.header }));
export default PsbtMultisigQRCode;

View File

@ -327,9 +327,7 @@ const PsbtWithHardwareWallet = () => {
export default PsbtWithHardwareWallet;
PsbtWithHardwareWallet.navigationOptions = navigationStyle({
title: loc.send.header,
});
PsbtWithHardwareWallet.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.send.header }));
const styles = StyleSheet.create({
root: {

View File

@ -84,8 +84,6 @@ const GeneralSettings = () => {
);
};
GeneralSettings.navigationOptions = navigationStyle({
title: loc.settings.general,
});
GeneralSettings.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.general }));
export default GeneralSettings;

View File

@ -39,8 +39,6 @@ const NetworkSettings = () => {
);
};
NetworkSettings.navigationOptions = navigationStyle({
title: loc.settings.network,
});
NetworkSettings.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.network }));
export default NetworkSettings;

View File

@ -136,8 +136,6 @@ const styles = StyleSheet.create({
},
});
SettingsPrivacy.navigationOptions = navigationStyle({
title: loc.settings.privacy,
});
SettingsPrivacy.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.privacy }));
export default SettingsPrivacy;

View File

@ -208,7 +208,5 @@ const About = () => {
);
};
About.navigationOptions = navigationStyle({
headerTitle: loc.settings.about,
});
About.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.about }));
export default About;

View File

@ -86,8 +86,6 @@ const Currency = () => {
);
};
Currency.navigationOptions = navigationStyle({
title: loc.settings.currency,
});
Currency.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.currency }));
export default Currency;

View File

@ -80,8 +80,6 @@ const DefaultView = () => {
);
};
DefaultView.navigationOptions = navigationStyle({
title: loc.settings.default_title,
});
DefaultView.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.default_title }));
export default DefaultView;

View File

@ -319,9 +319,7 @@ ElectrumSettings.propTypes = {
}),
};
ElectrumSettings.navigationOptions = navigationStyle({
title: loc.settings.electrum_settings,
});
ElectrumSettings.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.electrum_settings }));
const styles = StyleSheet.create({
root: {

View File

@ -167,6 +167,4 @@ const EncryptStorage = () => {
};
export default EncryptStorage;
EncryptStorage.navigationOptions = navigationStyle({
headerTitle: loc.settings.encrypt_title,
});
EncryptStorage.navigationOptions = navigationStyle({}, opts => ({ ...opts, headerTitle: loc.settings.encrypt_title }));

View File

@ -1,13 +1,12 @@
import React, { useState, useEffect, useContext } from 'react';
import { FlatList, StyleSheet } from 'react-native';
import { useNavigation, useTheme } from '@react-navigation/native';
import navigationStyle from '../../components/navigationStyle';
import { SafeBlueArea, BlueListItem, BlueLoading } from '../../BlueComponents';
import { AvailableLanguages } from '../../loc/languages';
import loc from '../../loc';
import { AvailableLanguages } from '../../loc/languages';
import { BlueStorageContext } from '../../blue_modules/storage-context';
import { useNavigation, useTheme } from '@react-navigation/native';
const styles = StyleSheet.create({
flex: {
@ -31,7 +30,7 @@ const Language = () => {
}, []);
useEffect(() => {
setOptions({ headerTitle: loc.settings.language });
setOptions({ title: loc.settings.language });
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [language]);
@ -64,8 +63,6 @@ const Language = () => {
);
};
Language.navigationOptions = navigationStyle({
headerTitle: loc.settings.language,
});
Language.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.language }));
export default Language;

View File

@ -153,8 +153,6 @@ const LightningSettings = () => {
);
};
LightningSettings.navigationOptions = navigationStyle({
title: loc.settings.lightning_settings,
});
LightningSettings.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.lightning_settings }));
export default LightningSettings;

View File

@ -156,9 +156,7 @@ const NotificationSettings = () => {
);
};
NotificationSettings.navigationOptions = navigationStyle({
title: loc.settings.notifications,
});
NotificationSettings.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.notifications }));
const styles = StyleSheet.create({
root: {

View File

@ -26,8 +26,6 @@ const ReleaseNotes = () => {
);
};
ReleaseNotes.navigationOptions = navigationStyle({
title: loc.settings.about_release_notes,
});
ReleaseNotes.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.about_release_notes }));
export default ReleaseNotes;

View File

@ -243,6 +243,4 @@ CPFP.propTypes = {
}),
}),
};
CPFP.navigationOptions = navigationStyle({
title: loc.transactions.cpfp_title,
});
CPFP.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.transactions.cpfp_title }));

View File

@ -117,6 +117,4 @@ RBFBumpFee.propTypes = {
}),
}),
};
RBFBumpFee.navigationOptions = navigationStyle({
title: loc.transactions.rbf_title,
});
RBFBumpFee.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.transactions.rbf_title }));

View File

@ -128,6 +128,4 @@ RBFCancel.propTypes = {
}),
};
RBFCancel.navigationOptions = navigationStyle({
title: loc.transactions.cancel_title,
});
RBFCancel.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.transactions.cancel_title }));

View File

@ -303,6 +303,4 @@ const styles = StyleSheet.create({
export default TransactionsDetails;
TransactionsDetails.navigationOptions = navigationStyle({
title: loc.transactions.details_title,
});
TransactionsDetails.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.transactions.details_title }));

View File

@ -329,11 +329,13 @@ const WalletsAdd = () => {
);
};
WalletsAdd.navigationOptions = navigationStyle({
closeButton: true,
headerTitle: loc.wallets.add_title,
headerLeft: null,
});
WalletsAdd.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.wallets.add_title }),
);
const styles = StyleSheet.create({
createButton: {

View File

@ -558,8 +558,6 @@ const WalletDetails = () => {
);
};
WalletDetails.navigationOptions = navigationStyle({
headerTitle: loc.wallets.details_title,
});
WalletDetails.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.wallets.details_title }));
export default WalletDetails;

View File

@ -133,10 +133,12 @@ const WalletExport = () => {
);
};
WalletExport.navigationOptions = navigationStyle({
closeButton: true,
title: loc.wallets.export_title,
headerLeft: null,
});
WalletExport.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.wallets.export_title }),
);
export default WalletExport;

View File

@ -127,10 +127,12 @@ const styles = StyleSheet.create({
},
});
ExportMultisigCoordinationSetup.navigationOptions = navigationStyle({
closeButton: true,
title: loc.multisig.export_coordination_setup,
headerLeft: null,
});
ExportMultisigCoordinationSetup.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.multisig.export_coordination_setup }),
);
export default ExportMultisigCoordinationSetup;

View File

@ -53,10 +53,12 @@ const HodlHodlLogin = () => {
);
};
HodlHodlLogin.navigationOptions = navigationStyle({
closeButton: true,
title: loc.hodl.login,
headerLeft: null,
});
HodlHodlLogin.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.hodl.login }),
);
export default HodlHodlLogin;

View File

@ -434,10 +434,10 @@ HodlHodlMyContracts.propTypes = {
HodlHodlMyContracts.navigationOptions = navigationStyle(
{
closeButton: true,
title: loc.hodl.cont_title,
},
(options, { theme, navigation, route }) => ({
...options,
title: loc.hodl.cont_title,
headerStyle: {
backgroundColor: theme.colors.elevated,
},

View File

@ -163,7 +163,6 @@ const WalletsImport = () => {
);
};
WalletsImport.navigationOptions = navigationStyle({
title: loc.wallets.import_title,
});
WalletsImport.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.wallets.import_title }));
export default WalletsImport;

View File

@ -87,14 +87,16 @@ const PleaseBackup = () => {
);
};
PleaseBackup.navigationOptions = navigationStyle({
closeButton: true,
title: loc.pleasebackup.title,
headerLeft: null,
headerRight: null,
gestureEnabled: false,
swipeEnabled: false,
});
PleaseBackup.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
headerRight: null,
gestureEnabled: false,
swipeEnabled: false,
},
opts => ({ ...opts, title: loc.pleasebackup.title }),
);
const styles = StyleSheet.create({
flex: {

View File

@ -78,13 +78,15 @@ const PleaseBackupLNDHub = () => {
);
};
PleaseBackupLNDHub.navigationOptions = navigationStyle({
closeButton: true,
title: loc.pleasebackup.title,
headerLeft: null,
headerRight: null,
gestureEnabled: false,
swipeEnabled: false,
});
PleaseBackupLNDHub.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
headerRight: null,
gestureEnabled: false,
swipeEnabled: false,
},
opts => ({ ...opts, title: loc.pleasebackup.title }),
);
export default PleaseBackupLNDHub;

View File

@ -271,9 +271,7 @@ const Entropy = () => {
);
};
Entropy.navigationOptions = navigationStyle({
title: loc.entropy.title,
});
Entropy.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.entropy.title }));
const styles = StyleSheet.create({
entropy: {

View File

@ -195,15 +195,17 @@ const ReorderWallets = () => {
);
};
ReorderWallets.navigationOptions = navigationStyle({
title: loc.wallets.reorder_title,
closeButton: true,
closeButtonFunc: ({ navigation, route }) => {
if (route.params && route.params.customCloseButtonFunction) {
route.params.customCloseButtonFunction();
}
ReorderWallets.navigationOptions = navigationStyle(
{
closeButton: true,
closeButtonFunc: ({ navigation, route }) => {
if (route.params && route.params.customCloseButtonFunction) {
route.params.customCloseButtonFunction();
}
},
headerLeft: null,
},
headerLeft: null,
});
opts => ({ ...opts, title: loc.wallets.reorder_title }),
);
export default ReorderWallets;

View File

@ -172,8 +172,6 @@ const SelectWallet = () => {
}
};
SelectWallet.navigationOptions = navigationStyle({
title: loc.wallets.select_wallet,
});
SelectWallet.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.wallets.select_wallet }));
export default SelectWallet;

View File

@ -738,10 +738,12 @@ const styles = StyleSheet.create({
},
});
ViewEditMultisigCosigners.navigationOptions = navigationStyle({
closeButton: true,
title: loc.multisig.manage_keys,
headerLeft: null,
});
ViewEditMultisigCosigners.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.multisig.manage_keys }),
);
export default ViewEditMultisigCosigners;

View File

@ -99,10 +99,12 @@ const WalletXpub = () => {
);
};
WalletXpub.navigationOptions = navigationStyle({
closeButton: true,
title: loc.wallets.xpub_title,
headerLeft: null,
});
WalletXpub.navigationOptions = navigationStyle(
{
closeButton: true,
headerLeft: null,
},
opts => ({ ...opts, title: loc.wallets.xpub_title }),
);
export default WalletXpub;