Skip to content

Commit

Permalink
fix: Remove scroll button from confirmation page (#13680)
Browse files Browse the repository at this point in the history
Remove scroll button from confirmation page as it is not part of the
designs

Fixes: MetaMask/MetaMask-planning#4277

1. Go to test dapp
2. Open any signature page with scroll
3. Ensure that scroll button does not appear

https://github.com/user-attachments/assets/d6771f31-646e-4110-926e-1bd7cfbf0891

- [X] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
  • Loading branch information
jpuri committed Feb 25, 2025
1 parent 583a8c0 commit 993ff66
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
7 changes: 1 addition & 6 deletions app/components/Views/confirmations/Confirm/Confirm.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,7 @@ const styleSheet = (params: {
padding: 4,
},
scrollable: {
minHeight: '100%',
},
scrollWrapper: {
minHeight: isFlatConfirmation ? '100%' : '75%',
maxHeight: isFlatConfirmation ? '100%' : '75%',
margin: 0,
height: '75%',
},
});
};
Expand Down
24 changes: 14 additions & 10 deletions app/components/Views/confirmations/Confirm/Confirm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import React from 'react';
import { ScrollView, StyleSheet, View } from 'react-native';
import {
ScrollView,
StyleSheet,
TouchableWithoutFeedback,
View,
} from 'react-native';
import { TransactionType } from '@metamask/transaction-controller';

import { useStyles } from '../../../../component-library/hooks';
Expand All @@ -26,15 +31,14 @@ const ConfirmWrapped = ({
}) => (
<QRHardwareContextProvider>
<Title />
<View style={styles.scrollWrapper}>
<ScrollView
style={styles.scrollable}
contentContainerStyle={styles.scrollableSection}
>
<SignatureBlockaidBanner />
<Info />
</ScrollView>
</View>
<ScrollView style={styles.scrollable}>
<TouchableWithoutFeedback>
<View style={styles.scrollableSection}>
<SignatureBlockaidBanner />
<Info />
</View>
</TouchableWithoutFeedback>
</ScrollView>
<Footer />
</QRHardwareContextProvider>
);
Expand Down

0 comments on commit 993ff66

Please sign in to comment.