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 margins and insets on Home scene #4755

Merged
merged 7 commits into from
Jan 29, 2024
Merged

Fix margins and insets on Home scene #4755

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a88fb8c
Fix margin on HomeSceneUi4
samholmes Jan 26, 2024
ee4fb28
Include safeAreaInset bottom to HomeSceneUi4
samholmes Jan 26, 2024
2ef6efc
Add proper padding to WalletListScene
samholmes Jan 26, 2024
4099b1e
Fix "done footer" render for sorting mode on WalletListScene
samholmes Jan 23, 2024
81a045f
Fully remove legacy PromoCard
Jon-edge Jan 26, 2024
cd3b281
Fix the transaction name margins in the TransactionListRow
Jon-edge Jan 26, 2024
dcf83db
Fix transaction list margins
Jon-edge Jan 26, 2024
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
Prev Previous commit
Fix transaction list margins 
We use the `overflow: 'visible'` rule on this scene to achieve the right
margins without losing the ability for the SceneHeader to extend outside
of the margins as necessary.
  • Loading branch information
@Jon-edge @samholmes
Jon-edge authored and samholmes committed Jan 29, 2024
commit dcf83db4881170c9b3adf14a18660a58eb405ed2
270 changes: 144 additions & 126 deletions src/__tests__/components/__snapshots__/TransactionListTop.test.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ exports[`TransactionListTop should render (with ENABLE_VISA_PROGRAM) 1`] = `
"borderRadius": 16,
},
{
"marginBottom": 22,
"marginBottom": 11,
"marginLeft": 11,
"marginRight": 11,
"marginTop": 11,
@@ -576,10 +576,10 @@ exports[`TransactionListTop should render (with ENABLE_VISA_PROGRAM) 1`] = `
"borderRadius": 16,
},
{
"marginBottom": -11,
"marginBottom": 11,
"marginLeft": 11,
"marginRight": 11,
"marginTop": 22,
"marginTop": 11,
},
{
"paddingBottom": 0,
@@ -699,83 +699,92 @@ exports[`TransactionListTop should render (with ENABLE_VISA_PROGRAM) 1`] = `
</View>,
<View
style={
[
{
"justifyContent": "center",
"marginHorizontal": 22,
"paddingBottom": 22,
},
null,
undefined,
]
{
"marginRight": -11,
"overflow": "visible",
}
}
>
<View
style={
[
{
"justifyContent": "center",
"marginHorizontal": 22,
"paddingBottom": 22,
},
null,
undefined,
]
}
>
<View
style={
{
"alignItems": "center",
"flexDirection": "row",
"justifyContent": "space-between",
}
}
/>
<Text
adjustsFontSizeToFit={true}
minimumFontScale={0.65}
numberOfLines={1}
style={
[
{
"color": "#FFFFFF",
"fontFamily": "Quicksand-Regular",
"fontSize": 22,
"includeFontPadding": false,
},
{
"fontFamily": "Quicksand-Medium",
},
null,
]
}
>
Transactions
</Text>
</View>
<BVLinearGradient
colors={
[
452984831,
452984831,
]
}
endPoint={
{
"alignItems": "center",
"flexDirection": "row",
"justifyContent": "space-between",
"x": 1,
"y": 0.5,
}
}
locations={null}
startPoint={
{
"x": 0,
"y": 0.5,
}
}
/>
<Text
adjustsFontSizeToFit={true}
minimumFontScale={0.65}
numberOfLines={1}
style={
[
{
"color": "#FFFFFF",
"fontFamily": "Quicksand-Regular",
"fontSize": 22,
"includeFontPadding": false,
"alignSelf": "stretch",
"height": 1,
},
{
"fontFamily": "Quicksand-Medium",
"marginBottom": 0,
"marginLeft": 22,
"marginRight": 0,
"marginTop": 0,
},
null,
]
}
>
Transactions
</Text>
/>
</View>,
<BVLinearGradient
colors={
[
452984831,
452984831,
]
}
endPoint={
{
"x": 1,
"y": 0.5,
}
}
locations={null}
startPoint={
{
"x": 0,
"y": 0.5,
}
}
style={
[
{
"alignSelf": "stretch",
"height": 1,
},
{
"marginBottom": 0,
"marginLeft": 22,
"marginRight": 0,
"marginTop": 0,
},
]
}
/>,
]
`;

@@ -789,7 +798,7 @@ exports[`TransactionListTop should render 1`] = `
"borderRadius": 16,
},
{
"marginBottom": 22,
"marginBottom": 11,
"marginLeft": 11,
"marginRight": 11,
"marginTop": 11,
@@ -1349,82 +1358,91 @@ exports[`TransactionListTop should render 1`] = `
</View>,
<View
style={
[
{
"justifyContent": "center",
"marginHorizontal": 22,
"paddingBottom": 22,
},
null,
undefined,
]
{
"marginRight": -11,
"overflow": "visible",
}
}
>
<View
style={
[
{
"justifyContent": "center",
"marginHorizontal": 22,
"paddingBottom": 22,
},
null,
undefined,
]
}
>
<View
style={
{
"alignItems": "center",
"flexDirection": "row",
"justifyContent": "space-between",
}
}
/>
<Text
adjustsFontSizeToFit={true}
minimumFontScale={0.65}
numberOfLines={1}
style={
[
{
"color": "#FFFFFF",
"fontFamily": "Quicksand-Regular",
"fontSize": 22,
"includeFontPadding": false,
},
{
"fontFamily": "Quicksand-Medium",
},
null,
]
}
>
Transactions
</Text>
</View>
<BVLinearGradient
colors={
[
452984831,
452984831,
]
}
endPoint={
{
"alignItems": "center",
"flexDirection": "row",
"justifyContent": "space-between",
"x": 1,
"y": 0.5,
}
}
locations={null}
startPoint={
{
"x": 0,
"y": 0.5,
}
}
/>
<Text
adjustsFontSizeToFit={true}
minimumFontScale={0.65}
numberOfLines={1}
style={
[
{
"color": "#FFFFFF",
"fontFamily": "Quicksand-Regular",
"fontSize": 22,
"includeFontPadding": false,
"alignSelf": "stretch",
"height": 1,
},
{
"fontFamily": "Quicksand-Medium",
"marginBottom": 0,
"marginLeft": 22,
"marginRight": 0,
"marginTop": 0,
},
null,
]
}
>
Transactions
</Text>
/>
</View>,
<BVLinearGradient
colors={
[
452984831,
452984831,
]
}
endPoint={
{
"x": 1,
"y": 0.5,
}
}
locations={null}
startPoint={
{
"x": 0,
"y": 0.5,
}
}
style={
[
{
"alignSelf": "stretch",
"height": 1,
},
{
"marginBottom": 0,
"marginLeft": 22,
"marginRight": 0,
"marginTop": 0,
},
]
}
/>,
]
`;
2 changes: 1 addition & 1 deletion src/components/cards/VisaCardCard.tsx
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ export const VisaCardCard = (props: Props) => {
return (
<>
{ioniaPluginIds.includes(pluginId) && tokenId == null && (
<CardUi4 paddingRem={0} marginRem={[1, 0.5, -0.5, 0.5]}>
<CardUi4 paddingRem={0}>
<TouchableOpacity onPress={handlePress} style={styles.container}>
<FastImage resizeMode="contain" source={{ uri: icon.symbolImage }} style={styles.icon} />
<EdgeText numberOfLines={0} style={styles.text}>
Loading
Loading