From 82a11309f6cc6adbf60a199be150e70d9b7ace02 Mon Sep 17 00:00:00 2001 From: vinnyhoward Date: Wed, 9 Oct 2024 16:01:14 -0600 Subject: [PATCH 1/2] fix: update UI according to feedback --- .../DefaultSettings/index.styles.ts | 4 +++- .../OnboardingSuccess/DefaultSettings/index.tsx | 16 +++++++++------- .../Views/OnboardingSuccess/index.styles.ts | 1 + locales/languages/en.json | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/components/Views/OnboardingSuccess/DefaultSettings/index.styles.ts b/app/components/Views/OnboardingSuccess/DefaultSettings/index.styles.ts index c8eb0846267..dbfe8074c56 100644 --- a/app/components/Views/OnboardingSuccess/DefaultSettings/index.styles.ts +++ b/app/components/Views/OnboardingSuccess/DefaultSettings/index.styles.ts @@ -4,9 +4,11 @@ const styleSheet = () => StyleSheet.create({ root: { flex: 1, - paddingHorizontal: 16, paddingTop: 16, }, + textContainer: { + paddingHorizontal: 16, + }, }); export default styleSheet; diff --git a/app/components/Views/OnboardingSuccess/DefaultSettings/index.tsx b/app/components/Views/OnboardingSuccess/DefaultSettings/index.tsx index 04398e444e9..5133090bd6f 100644 --- a/app/components/Views/OnboardingSuccess/DefaultSettings/index.tsx +++ b/app/components/Views/OnboardingSuccess/DefaultSettings/index.tsx @@ -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'; @@ -24,13 +24,15 @@ const DefaultSettings = () => { return ( - - {strings('default_settings.description')} - - {' '} - {strings('default_settings.learn_more_about_privacy')} + + + {strings('default_settings.description')} + + {' '} + {strings('default_settings.learn_more_about_privacy')} + - + Date: Wed, 9 Oct 2024 16:36:31 -0600 Subject: [PATCH 2/2] update: snapshots --- .../__snapshots__/index.test.tsx.snap | 37 +++++++++++-------- .../DefaultSettings/index.styles.ts | 5 +++ .../DefaultSettings/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../__snapshots__/index.test.js.snap | 1 + .../__snapshots__/index.test.tsx.snap | 2 +- .../SecuritySettings.test.tsx.snap | 2 +- 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/app/components/Views/OnboardingSuccess/DefaultSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/OnboardingSuccess/DefaultSettings/__snapshots__/index.test.tsx.snap index 889294a0f8e..1188da6d302 100644 --- a/app/components/Views/OnboardingSuccess/DefaultSettings/__snapshots__/index.test.tsx.snap +++ b/app/components/Views/OnboardingSuccess/DefaultSettings/__snapshots__/index.test.tsx.snap @@ -5,32 +5,23 @@ exports[`DefaultSettings should render correctly 1`] = ` style={ { "flex": 1, - "paddingHorizontal": 16, "paddingTop": 16, } } > - - MetaMask uses default settings to best balance safety and ease of use. Change these settings to further increase your privacy. - - 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. + + + Learn more about privacy best practices. + - + diff --git a/app/components/Views/OnboardingSuccess/DefaultSettings/index.styles.ts b/app/components/Views/OnboardingSuccess/DefaultSettings/index.styles.ts index dbfe8074c56..b7d364a31f8 100644 --- a/app/components/Views/OnboardingSuccess/DefaultSettings/index.styles.ts +++ b/app/components/Views/OnboardingSuccess/DefaultSettings/index.styles.ts @@ -3,6 +3,11 @@ import { StyleSheet } from 'react-native'; const styleSheet = () => StyleSheet.create({ root: { + flex: 1, + paddingHorizontal: 16, + paddingTop: 16, + }, + scrollRoot: { flex: 1, paddingTop: 16, }, diff --git a/app/components/Views/OnboardingSuccess/DefaultSettings/index.tsx b/app/components/Views/OnboardingSuccess/DefaultSettings/index.tsx index 5133090bd6f..23f69a74bc6 100644 --- a/app/components/Views/OnboardingSuccess/DefaultSettings/index.tsx +++ b/app/components/Views/OnboardingSuccess/DefaultSettings/index.tsx @@ -23,7 +23,7 @@ const DefaultSettings = () => { }; return ( - + {strings('default_settings.description')} diff --git a/app/components/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap index cb7709a24ac..b0bcfc317e1 100644 --- a/app/components/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap +++ b/app/components/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap @@ -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. diff --git a/app/components/Views/OnboardingSuccess/__snapshots__/index.test.js.snap b/app/components/Views/OnboardingSuccess/__snapshots__/index.test.js.snap index 719f3b38306..fe9a3706b63 100644 --- a/app/components/Views/OnboardingSuccess/__snapshots__/index.test.js.snap +++ b/app/components/Views/OnboardingSuccess/__snapshots__/index.test.js.snap @@ -120,6 +120,7 @@ exports[`OnboardingSuccess should render correctly 1`] = ` { "alignItems": "center", "flexDirection": "row", + "marginTop": 16, }, { "paddingTop": 10, diff --git a/app/components/Views/Settings/BatchAccountBalanceSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/Settings/BatchAccountBalanceSettings/__snapshots__/index.test.tsx.snap index 2d527d6f72d..b55d2c4c1e5 100644 --- a/app/components/Views/Settings/BatchAccountBalanceSettings/__snapshots__/index.test.tsx.snap +++ b/app/components/Views/Settings/BatchAccountBalanceSettings/__snapshots__/index.test.tsx.snap @@ -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. `; diff --git a/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap b/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap index d1e65c06183..16976b7b6a3 100644 --- a/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap +++ b/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap @@ -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.