Skip to content

Commit 262d23b

Browse files
committed
update to use View outermost element
1 parent 50d38b6 commit 262d23b

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

src/components/AccountSwitcher.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
252252
menuItems={menuItems()}
253253
headerText={translate('delegate.switchAccount')}
254254
containerStyles={[{maxHeight: windowHeight / 2}, styles.pb0, styles.mw100, shouldUseNarrowLayout ? {} : styles.wFitContent]}
255-
headerStyles={styles.pb0}
255+
headerStyles={styles.pt0}
256256
innerContainerStyle={styles.pb0}
257257
scrollContainerStyle={styles.pb4}
258258
shouldUseScrollView

src/components/PopoverMenu.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ function PopoverMenu({
343343
if (!headerText || enteredSubMenuIndexes.length !== 0) {
344344
return;
345345
}
346-
return <Text style={[styles.createMenuHeaderText, styles.ph5, styles.pt4, headerStyles]}>{headerText}</Text>;
346+
return <Text style={[styles.createMenuHeaderText, styles.ph5, styles.pv3, headerStyles]}>{headerText}</Text>;
347347
};
348348

349349
useKeyboardShortcut(
@@ -440,13 +440,11 @@ function PopoverMenu({
440440
<FocusTrapForModal active={isVisible}>
441441
<View
442442
onLayout={onLayout}
443-
style={[menuContainerStyle, containerStyles, styles.pv0]}
443+
style={[menuContainerStyle, containerStyles, {paddingTop, paddingBottom, paddingVertical, ...(isWebOrDesktop ? styles.flex1 : styles.flexGrow1)}]}
444444
>
445445
{renderHeaderText()}
446-
<View style={{paddingTop, paddingBottom, paddingVertical, ...(isWebOrDesktop ? styles.flex1 : styles.flexGrow1)}}>
447-
{enteredSubMenuIndexes.length > 0 && renderBackButtonItem()}
448-
{renderWithConditionalWrapper(shouldUseScrollView, restScrollContainerStyle, renderedMenuItems)}
449-
</View>
446+
{enteredSubMenuIndexes.length > 0 && renderBackButtonItem()}
447+
{renderWithConditionalWrapper(shouldUseScrollView, restScrollContainerStyle, renderedMenuItems)}
450448
</View>
451449
</FocusTrapForModal>
452450
</PopoverWithMeasuredContent>

0 commit comments

Comments
 (0)