From c25490601d258b8e56ca8122d5ace6eefa007a4d Mon Sep 17 00:00:00 2001 From: digiwand <20778143+digiwand@users.noreply.github.com> Date: Tue, 4 Mar 2025 06:04:41 -0800 Subject: [PATCH 1/5] fix: permit simulation overflow --- .../Simulation/components/ValueDisplay/ValueDisplay.styles.ts | 1 - .../confirmations/components/UI/InfoRow/InfoRow.styles.ts | 3 --- .../Views/confirmations/components/UI/InfoRow/InfoRow.tsx | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.styles.ts b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.styles.ts index bf673e46b29f..b074595c45e6 100644 --- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.styles.ts +++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.styles.ts @@ -49,7 +49,6 @@ const styleSheet = (colors: Theme['colors']) => rowGap: 8, flexDirection: 'row', alignItems: 'center', - alignSelf: 'center', justifyContent: 'flex-end', flexWrap: 'wrap', }, diff --git a/app/components/Views/confirmations/components/UI/InfoRow/InfoRow.styles.ts b/app/components/Views/confirmations/components/UI/InfoRow/InfoRow.styles.ts index 3ff7e400c9a6..b17ee981e73f 100644 --- a/app/components/Views/confirmations/components/UI/InfoRow/InfoRow.styles.ts +++ b/app/components/Views/confirmations/components/UI/InfoRow/InfoRow.styles.ts @@ -36,9 +36,6 @@ const styleSheet = (params: { theme: Theme }) => { ...fontStyles.normal, fontSize: 14, }, - valueComponent: { - marginLeft: 'auto', - }, }); }; diff --git a/app/components/Views/confirmations/components/UI/InfoRow/InfoRow.tsx b/app/components/Views/confirmations/components/UI/InfoRow/InfoRow.tsx index 7e06de540299..44e2adf69f93 100644 --- a/app/components/Views/confirmations/components/UI/InfoRow/InfoRow.tsx +++ b/app/components/Views/confirmations/components/UI/InfoRow/InfoRow.tsx @@ -36,7 +36,7 @@ const InfoRow = ({ {typeof children === 'string' ? ( {children} ) : ( - {children} + <>{children} )} ); From abb11b37bc9fdcce45b4fd8871f5a4d8370172a5 Mon Sep 17 00:00:00 2001 From: digiwand <20778143+digiwand@users.noreply.github.com> Date: Tue, 4 Mar 2025 23:18:30 -0800 Subject: [PATCH 2/5] fix: AccountNetworkInfoExpanded snapshot --- .../AccountNetworkInfoExpanded.test.tsx.snap | 70 ++++++++----------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/app/components/Views/confirmations/components/Confirm/AccountNetworkInfo/AccountNetworkInfoExpanded/__snapshots__/AccountNetworkInfoExpanded.test.tsx.snap b/app/components/Views/confirmations/components/Confirm/AccountNetworkInfo/AccountNetworkInfoExpanded/__snapshots__/AccountNetworkInfoExpanded.test.tsx.snap index cbe58ff5a9d0..5b30e3087d2a 100644 --- a/app/components/Views/confirmations/components/Confirm/AccountNetworkInfo/AccountNetworkInfoExpanded/__snapshots__/AccountNetworkInfoExpanded.test.tsx.snap +++ b/app/components/Views/confirmations/components/Confirm/AccountNetworkInfo/AccountNetworkInfoExpanded/__snapshots__/AccountNetworkInfoExpanded.test.tsx.snap @@ -196,7 +196,9 @@ exports[`AccountNetworkInfoExpanded should match snapshot when isPortfolioVieEna @@ -204,54 +206,44 @@ exports[`AccountNetworkInfoExpanded should match snapshot when isPortfolioVieEna style={ { "alignItems": "center", - "display": "flex", - "flexDirection": "row", + "backgroundColor": "#ffffff", + "borderRadius": 8, + "height": 16, + "justifyContent": "center", + "overflow": "hidden", + "width": 16, } } > - - - - - Ethereum Mainnet - + testID="network-avatar-image" + /> + + Ethereum Mainnet + From af9340589b702b42282bb8e408151ea534751b84 Mon Sep 17 00:00:00 2001 From: digiwand <20778143+digiwand@users.noreply.github.com> Date: Tue, 4 Mar 2025 23:37:09 -0800 Subject: [PATCH 3/5] fix: SnapUIRenderer snapshot --- .../SnapUIRenderer.test.tsx.snap | 82 +++++++++---------- 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.tsx.snap b/app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.tsx.snap index 996e4c368fcb..a437fcdbb645 100644 --- a/app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.tsx.snap +++ b/app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.tsx.snap @@ -828,58 +828,50 @@ exports[`SnapUIRenderer renders complex nested components 1`] = ` - - - Extra - - + - Value - - + } + > + Value + Date: Wed, 5 Mar 2025 00:05:35 -0800 Subject: [PATCH 4/5] fix: add padding horizontal 16 to title and subtitle --- .../Views/confirmations/components/Confirm/Title/Title.styles.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/components/Views/confirmations/components/Confirm/Title/Title.styles.ts b/app/components/Views/confirmations/components/Confirm/Title/Title.styles.ts index a324c795f298..d0bfa927e7fa 100644 --- a/app/components/Views/confirmations/components/Confirm/Title/Title.styles.ts +++ b/app/components/Views/confirmations/components/Confirm/Title/Title.styles.ts @@ -9,6 +9,7 @@ const styleSheet = (params: { theme: Theme }) => { return StyleSheet.create({ titleContainer: { marginVertical: 24, + paddingHorizontal: 16, }, title: { color: theme.colors.text.default, From 280cd9079d226e12c0bef1bbb373e6985bd59db0 Mon Sep 17 00:00:00 2001 From: digiwand <20778143+digiwand@users.noreply.github.com> Date: Wed, 5 Mar 2025 00:12:13 -0800 Subject: [PATCH 5/5] fix: sneak in message alignment --- .../SignatureMessageSection/SignatureMessageSection.styles.ts | 1 - .../components/UI/ExpandableSection/ExpandableSection.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/components/Views/confirmations/components/Confirm/SignatureMessageSection/SignatureMessageSection.styles.ts b/app/components/Views/confirmations/components/Confirm/SignatureMessageSection/SignatureMessageSection.styles.ts index 8ca0f9c561c4..f2785c4ec6ac 100644 --- a/app/components/Views/confirmations/components/Confirm/SignatureMessageSection/SignatureMessageSection.styles.ts +++ b/app/components/Views/confirmations/components/Confirm/SignatureMessageSection/SignatureMessageSection.styles.ts @@ -18,7 +18,6 @@ const styleSheet = (params: { theme: Theme }) => { color: theme.colors.text.default, ...fontStyles.bold, fontSize: 14, - marginBottom: 4, }, description: { color: theme.colors.text.default, diff --git a/app/components/Views/confirmations/components/UI/ExpandableSection/ExpandableSection.tsx b/app/components/Views/confirmations/components/UI/ExpandableSection/ExpandableSection.tsx index 6f1d76c7df66..e4a295e4e952 100644 --- a/app/components/Views/confirmations/components/UI/ExpandableSection/ExpandableSection.tsx +++ b/app/components/Views/confirmations/components/UI/ExpandableSection/ExpandableSection.tsx @@ -39,7 +39,7 @@ const ExpandableSection = ({ const [expanded, setExpanded] = useState(false); const iconStyle = - iconVerticalPosition === IconVerticalPosition.Top ? { top: 18 } : {}; + iconVerticalPosition === IconVerticalPosition.Top ? { top: 20 } : {}; return ( <>