Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 88d7ad7

Browse files
authoredApr 7, 2025··
Merge branch 'upgrade/react-native/0.76.6' into chore/upgrade-yarn-v3
2 parents 1e006af + 6c12898 commit 88d7ad7

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed
 

‎app/components/UI/ActionView/index.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export default function ActionView({
6868
style = undefined,
6969
confirmButtonState = ConfirmButtonState.Normal,
7070
scrollViewTestID,
71+
contentContainerStyle,
7172
}) {
7273
const { colors } = useTheme();
7374
confirmText = confirmText || strings('action_view.confirm');
@@ -81,6 +82,7 @@ export default function ActionView({
8182
resetScrollToCoords={{ x: 0, y: 0 }}
8283
keyboardShouldPersistTaps={keyboardShouldPersistTaps}
8384
testID={scrollViewTestID}
85+
contentContainerStyle={contentContainerStyle}
8486
>
8587
<TouchableWithoutFeedback
8688
style={baseStyles.flexGrow}
@@ -149,6 +151,7 @@ ActionView.defaultProps = {
149151
cancelTestID: '',
150152
showCancelButton: true,
151153
showConfirmButton: true,
154+
contentContainerStyle: undefined,
152155
};
153156

154157
ActionView.propTypes = {
@@ -226,4 +229,8 @@ ActionView.propTypes = {
226229
* Optional TestID for the parent scroll View
227230
*/
228231
scrollViewTestID: PropTypes.string,
232+
/**
233+
* Optional View styles. Applies to scroll view
234+
*/
235+
contentContainerStyle: PropTypes.object,
229236
};

‎app/components/Views/RevealPrivateCredential/RevealPrivateCredential.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ const RevealPrivateCredential = ({
618618
scrollViewTestID={
619619
RevealSeedViewSelectorsIDs.REVEAL_CREDENTIAL_SCROLL_ID
620620
}
621+
contentContainerStyle={styles.stretch}
621622
>
622623
<>
623624
<View style={[styles.rowWrapper, styles.normalText]}>
@@ -631,7 +632,7 @@ const RevealPrivateCredential = ({
631632
</View>
632633
{renderWarning(credentialSlug)}
633634

634-
<View style={styles.rowWrapper}>
635+
<View style={[styles.rowWrapper, styles.stretch]}>
635636
{unlocked ? renderTabView(credentialSlug) : renderPasswordEntry()}
636637
</View>
637638
</>

‎app/components/Views/RevealPrivateCredential/styles.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,7 @@ export const createStyles = (theme: Theme) =>
128128
tabBar: {
129129
borderColor: theme.colors.border.muted,
130130
},
131+
stretch: {
132+
flex: 1,
133+
},
131134
});

0 commit comments

Comments
 (0)
Please sign in to comment.