Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(1702): update onboarding settings UI #11723

Merged
merged 4 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,23 @@ exports[`DefaultSettings should render correctly 1`] = `
style={
{
"flex": 1,
"paddingHorizontal": 16,
"paddingTop": 16,
}
}
>
<View>
<Text
accessibilityRole="text"
<View
style={
{
"color": "#141618",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
"paddingHorizontal": 16,
}
}
>
MetaMask uses default settings to best balance safety and ease of use. Change these settings to further increase your privacy.
<Text
accessibilityRole="text"
onPress={[Function]}
style={
{
"color": "#0376c9",
"color": "#141618",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
Expand All @@ -39,10 +30,26 @@ exports[`DefaultSettings should render correctly 1`] = `
}
}
>

Learn more about privacy best practices.
MetaMask uses default settings to best balance safety and ease of use. Change these settings to further increase your privacy.
<Text
accessibilityRole="text"
onPress={[Function]}
style={
{
"color": "#0376c9",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
}
>

Learn more about privacy best practices.
</Text>
</Text>
</Text>
</View>
<TouchableOpacity
onPress={[Function]}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ const styleSheet = () =>
paddingHorizontal: 16,
paddingTop: 16,
},
scrollRoot: {
flex: 1,
paddingTop: 16,
},
textContainer: {
paddingHorizontal: 16,
},
});

export default styleSheet;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { ScrollView, Linking } from 'react-native';
import { ScrollView, Linking, View } from 'react-native';
import { useNavigation } from '@react-navigation/native';
import { useOnboardingHeader } from '../../../hooks/useOnboardingHeader';
import { useStyles } from '../../../../component-library/hooks';
Expand All @@ -23,14 +23,16 @@ const DefaultSettings = () => {
};

return (
<ScrollView style={styles.root}>
<Text variant={TextVariant.BodyMD}>
{strings('default_settings.description')}
<Text color={TextColor.Info} onPress={handleLink}>
{' '}
{strings('default_settings.learn_more_about_privacy')}
<ScrollView style={styles.scrollRoot}>
<View style={styles.textContainer}>
<Text variant={TextVariant.BodyMD}>
{strings('default_settings.description')}
<Text color={TextColor.Info} onPress={handleLink}>
{' '}
{strings('default_settings.learn_more_about_privacy')}
</Text>
</Text>
</Text>
</View>
<SettingsDrawer
title={strings('default_settings.drawer_general_title')}
description={strings('default_settings.drawer_general_title_desc')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
}
}
>
We batch accounts and query Infura to responsively show your balances. If you turn this off, only active accounts will be queried. Some dApps won’t work unless you connect your wallet.
Get balance updates for all your accounts at once. Turning off this feature means others are less likely to associate one account with another.
</Text>
</View>
</View>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ exports[`OnboardingSuccess should render correctly 1`] = `
{
"alignItems": "center",
"flexDirection": "row",
"marginTop": 16,
},
{
"paddingTop": 10,
Expand Down
1 change: 1 addition & 0 deletions app/components/Views/OnboardingSuccess/index.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ const styles = StyleSheet.create({
linkWrapper: {
flexDirection: 'row',
alignItems: 'center',
marginTop: 16,
},
footerText: {
fontSize: 12,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ exports[`BatchAccountBalanceSettings should render correctly 1`] = `
}
}
>
We batch accounts and query Infura to responsively show your balances. If you turn this off, only active accounts will be queried. Some dApps won’t work unless you connect your wallet.
Get balance updates for all your accounts at once. Turning off this feature means others are less likely to associate one account with another.
</Text>
</View>
`;
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,7 @@ exports[`SecuritySettings should render correctly 1`] = `
}
}
>
We batch accounts and query Infura to responsively show your balances. If you turn this off, only active accounts will be queried. Some dApps won’t work unless you connect your wallet.
Get balance updates for all your accounts at once. Turning off this feature means others are less likely to associate one account with another.
</Text>
</View>
<View
Expand Down
2 changes: 1 addition & 1 deletion locales/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@
"data_collection_title": "Data collection for marketing",
"data_collection_description": "We’ll use MetaMetrics to learn how you interact with our marketing communications. We may share relevant news (like product features and other materials).",
"batch_balance_requests_title": "Batch account balance requests",
"batch_balance_requests_description": "We batch accounts and query Infura to responsively show your balances. If you turn this off, only active accounts will be queried. Some dApps won’t work unless you connect your wallet.",
"batch_balance_requests_description": "Get balance updates for all your accounts at once. Turning off this feature means others are less likely to associate one account with another.",
"third_party_title": "Get incoming transactions",
"third_party_description": "Third party APIs (Etherscan) are used to show your incoming transactions in the history. Turn off if you don’t want us to pull data from those services.",
"metametrics_opt_out": "MetaMetrics Opt-out",
Expand Down
Loading