REF: Move Privacy under General tab

This commit is contained in:
ncoelho 2021-04-06 12:31:56 +02:00
parent 56a519073c
commit 02df0d7b71
3 changed files with 16 additions and 16 deletions

View File

@ -33,6 +33,10 @@ const GeneralSettings = () => {
})();
});
const navigateToPrivacy = () => {
navigate('SettingsPrivacy');
};
const stylesWithThemeHook = {
root: {
...styles.root,
@ -57,6 +61,7 @@ const GeneralSettings = () => {
<BlueListItem component={TouchableOpacity} onPress={() => navigate('DefaultView')} title={loc.settings.default_title} chevron />
</>
)}
<BlueListItem title={loc.settings.privacy} onPress={navigateToPrivacy} testID="SettingsPrivacy" chevron />
{Platform.OS === 'ios' ? (
<>
<BlueListItem

View File

@ -17,17 +17,11 @@ const NetworkSettings = () => {
navigate('Broadcast');
};
const navigateToPrivacy = () => {
navigate('SettingsPrivacy');
};
return (
<SafeBlueArea>
<ScrollView>
<BlueListItem title={loc.is_it_my_address.title} onPress={navigateToIsItMyAddress} testID="IsItMyAddress" chevron />
<BlueListItem title={loc.settings.network_broadcast} onPress={navigateToBroadcast} testID="Broadcast" chevron />
<BlueListItem title={loc.settings.privacy} onPress={navigateToPrivacy} testID="SettingsPrivacy" chevron />
</ScrollView>
</SafeBlueArea>
);

View File

@ -41,8 +41,18 @@ describe('BlueWallet UI Tests', () => {
await element(by.id('SettingsButton')).tap();
// general
// enable AdvancedMode
await element(by.id('GeneralSettings')).tap();
// privacy
// trigger switches
await element(by.id('SettingsPrivacy')).tap();
await element(by.id('ClipboardSwith')).tap();
await element(by.id('ClipboardSwith')).tap();
await element(by.id('QuickActionsSwith')).tap();
await element(by.id('QuickActionsSwith')).tap();
await device.pressBack();
// enable AdvancedMode
await element(by.id('AdvancedMode')).tap();
await device.pressBack();
//
@ -139,15 +149,6 @@ describe('BlueWallet UI Tests', () => {
await element(by.id('CheckAddress')).tap();
await expect(element(by.id('Result'))).toHaveText('None of the available wallets own the provided address.');
await device.pressBack();
// privacy
// trigger switches
await element(by.id('SettingsPrivacy')).tap();
await element(by.id('ClipboardSwith')).tap();
await element(by.id('ClipboardSwith')).tap();
await element(by.id('QuickActionsSwith')).tap();
await element(by.id('QuickActionsSwith')).tap();
await device.pressBack();
await device.pressBack();
// about