Skip to content

chore(runway): cherry-pick fix: cp-7.47.0 add MetaMask fee disclaimer text to bridge view #15380

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

Merged
NicolasMassart merged 2 commits into from
May 16, 2025
Merged

chore(runway): cherry-pick fix: cp-7.47.0 add MetaMask fee disclaimer text to bridge view #15380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40d9a15
chore(runway): cherry-pick fix: cp-7.47.0 add MetaMask fee disclaimer…
amitabh94 May 15, 2025
510e468
Merge branch 'release/7.47.0' into runway-cherry-pick-7.47.0-1747354756
NicolasMassart May 16, 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
5 changes: 1 addition & 4 deletions app/components/UI/Bridge/Views/BridgeView/BridgeView.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@ export const createStyles = (params: { theme: Theme }) => {
alignItems: 'center',
justifyContent: 'center',
backgroundColor: theme.colors.background.default,
paddingTop: 12,
},
button: {
width: '100%',
},
bottomSection: {
flex: 1,
justifyContent: 'flex-end',
},
arrowContainer: {
position: 'relative',
alignItems: 'center',
Expand Down
2 changes: 2 additions & 0 deletions app/components/UI/Bridge/Views/BridgeView/__snapshots__/BridgeView.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,7 @@ exports[`BridgeView Bottom Content blurs input when opening QuoteExpiredModal 1`
"justifyContent": "center",
"paddingBottom": 24,
"paddingHorizontal": 16,
"paddingTop": 12,
"width": "100%",
},
]
Expand Down Expand Up @@ -1857,6 +1858,7 @@ exports[`BridgeView renders 1`] = `
"justifyContent": "center",
"paddingBottom": 24,
"paddingHorizontal": 16,
"paddingTop": 12,
"width": "100%",
},
]
Expand Down
6 changes: 2 additions & 4 deletions app/components/UI/Bridge/Views/BridgeView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,7 @@ const BridgeView = () => {
tokenBalance={latestSourceBalance?.displayBalance}
networkImageSource={
sourceToken?.chainId
?
getNetworkImageSource({
? getNetworkImageSource({
chainId: sourceToken?.chainId,
})
: undefined
Expand All @@ -395,8 +394,7 @@ const BridgeView = () => {
token={destToken}
networkImageSource={
destToken
?
getNetworkImageSource({ chainId: destToken?.chainId })
? getNetworkImageSource({ chainId: destToken?.chainId })
: undefined
}
testID="dest-token-area"
Expand Down
3 changes: 3 additions & 0 deletions app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ const createStyles = ({ colors }: Theme) =>
alignItems: 'center',
gap: 4,
},
disclaimerText: {
textAlign: 'center',
},
});

export default createStyles;
Loading
Loading