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.

Sign up for GitHub

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: Permit Simulation vertical overflow, title padding, and collapsed message alignment #13830

Merged
merged 7 commits into from
Mar 5, 2025
Merged

fix: Permit Simulation vertical overflow, title padding, and collapsed message alignment #13830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c254906
fix: permit simulation overflow
digiwand Mar 4, 2025
ddfadc6
Merge branch 'main' into fix-permit-simulation-overflow-wrapped-values
digiwand Mar 4, 2025
b99c5cd
Merge branch 'main' into fix-permit-simulation-overflow-wrapped-values
digiwand Mar 5, 2025
abb11b3
fix: AccountNetworkInfoExpanded snapshot
digiwand Mar 5, 2025
af93405
fix: SnapUIRenderer snapshot
digiwand Mar 5, 2025
10a6ee4
fix: add padding horizontal 16 to title and subtitle
digiwand Mar 5, 2025
280cd90
fix: sneak in message alignment
digiwand Mar 5, 2025
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
82 changes: 37 additions & 45 deletions app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,58 +828,50 @@ exports[`SnapUIRenderer renders complex nested components 1`] = `
</Text>
</View>
<View
alignItems="center"
flexDirection="row"
gap={4}
style={
{
"marginLeft": "auto",
}
[
{
"alignItems": "center",
"flexDirection": "row",
"gap": 4,
},
undefined,
]
}
>
<View
alignItems="center"
flexDirection="row"
gap={4}
<Text
accessibilityRole="text"
style={
[
{
"alignItems": "center",
"flexDirection": "row",
"gap": 4,
},
undefined,
]
{
"color": "#9fa6ae",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
}
>
<Text
accessibilityRole="text"
style={
{
"color": "#9fa6ae",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
}
>
Extra
</Text>
<Text
accessibilityRole="text"
style={
{
"color": "#141618",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
Extra
</Text>
<Text
accessibilityRole="text"
style={
{
"color": "#141618",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
>
Value
</Text>
</View>
}
>
Value
</Text>
</View>
</View>
<View
Expand Down
70 changes: 31 additions & 39 deletions ...orkInfo/AccountNetworkInfoExpanded/__snapshots__/AccountNetworkInfoExpanded.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,62 +196,54 @@ exports[`AccountNetworkInfoExpanded should match snapshot when isPortfolioVieEna
<View
style={
{
"marginLeft": "auto",
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
}
}
>
<View
style={
{
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
"backgroundColor": "#ffffff",
"borderRadius": 8,
"height": 16,
"justifyContent": "center",
"overflow": "hidden",
"width": 16,
}
}
>
<View
<Image
onError={[Function]}
resizeMode="contain"
source={1}
style={
{
"alignItems": "center",
"backgroundColor": "#ffffff",
"borderRadius": 8,
"height": 16,
"justifyContent": "center",
"overflow": "hidden",
"width": 16,
}
}
>
<Image
onError={[Function]}
resizeMode="contain"
source={1}
style={
{
"height": 16,
"width": 16,
}
}
testID="network-avatar-image"
/>
</View>
<Text
accessibilityRole="text"
style={
{
"color": "#141618",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
"marginLeft": 8,
}
}
>
Ethereum Mainnet
</Text>
testID="network-avatar-image"
/>
</View>
<Text
accessibilityRole="text"
style={
{
"color": "#141618",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
"marginLeft": 8,
}
}
>
Ethereum Mainnet
</Text>
</View>
</View>
</View>
Expand Down
1 change: 0 additions & 1 deletion ...ents/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ const styleSheet = (colors: Theme['colors']) =>
rowGap: 8,
flexDirection: 'row',
alignItems: 'center',
alignSelf: 'center',
justifyContent: 'flex-end',
flexWrap: 'wrap',
},
Expand Down
1 change: 0 additions & 1 deletion ...onfirmations/components/Confirm/SignatureMessageSection/SignatureMessageSection.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions app/components/Views/confirmations/components/Confirm/Title/Title.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const styleSheet = (params: { theme: Theme }) => {
return StyleSheet.create({
titleContainer: {
marginVertical: 24,
paddingHorizontal: 16,
},
title: {
color: theme.colors.text.default,
Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/confirmations/components/UI/ExpandableSection/ExpandableSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const ExpandableSection = ({
const [expanded, setExpanded] = useState(false);

const iconStyle =
iconVerticalPosition === IconVerticalPosition.Top ? { top: 18 } : {};
iconVerticalPosition === IconVerticalPosition.Top ? { top: 20 } : {};

return (
<>
Expand Down
3 changes: 0 additions & 3 deletions app/components/Views/confirmations/components/UI/InfoRow/InfoRow.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ const styleSheet = (params: { theme: Theme }) => {
...fontStyles.normal,
fontSize: 14,
},
valueComponent: {
marginLeft: 'auto',
},
});
};

Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/confirmations/components/UI/InfoRow/InfoRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const InfoRow = ({
{typeof children === 'string' ? (
<Text style={styles.value}>{children}</Text>
) : (
<View style={styles.valueComponent}>{children}</View>
<>{children}</>
)}
</View>
);
Expand Down
Loading