diff --git a/src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js b/src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js index 433620deecb96..cf16d687d5557 100644 --- a/src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js +++ b/src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js @@ -28,10 +28,15 @@ export default ( cardStyle.transform = [{translateX}]; } - return ({ - containerStyle: { + let containerStyle; + if (!isSmallScreenWidth) { + containerStyle = { overflow: 'hidden', - }, + }; + } + + return ({ + containerStyle, cardStyle, overlayStyle: { opacity: progress.interpolate({ diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js index 6bed29f4e24bc..44f5e1e7083e8 100755 --- a/src/pages/SearchPage.js +++ b/src/pages/SearchPage.js @@ -180,6 +180,7 @@ class SearchPage extends Component { hideAdditionalOptionStates showTitleTooltip shouldShowOptions={didScreenTransitionEnd} + shouldDelayFocus /> diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js index 2621b19ce81fc..d5b555f40338b 100644 --- a/src/pages/iou/IOUCurrencySelection.js +++ b/src/pages/iou/IOUCurrencySelection.js @@ -126,6 +126,7 @@ class IOUCurrencySelection extends Component { onChangeText={this.changeSearchValue} placeholderText={this.props.translate('common.search')} headerMessage={headerMessage} + shouldDelayFocus /> ); diff --git a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js index 56a9f2634ee6b..5968242bcbac6 100755 --- a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js +++ b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js @@ -136,6 +136,7 @@ class IOUParticipantsRequest extends Component { headerMessage={headerMessage} hideAdditionalOptionStates forceTextUnreadStyle + shouldDelayFocus /> ); } diff --git a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js index f1a1f2a3f5c57..eacefbeedceb3 100755 --- a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js +++ b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js @@ -227,6 +227,7 @@ class IOUParticipantsSplit extends Component { shouldShowConfirmButton confirmButtonText={this.props.translate('common.next')} onConfirmSelection={this.finalizeParticipants} + shouldDelayFocus /> diff --git a/src/styles/cardStyles/index.js b/src/styles/cardStyles/index.js index 4759700c6f929..662beb6390cd1 100644 --- a/src/styles/cardStyles/index.js +++ b/src/styles/cardStyles/index.js @@ -8,9 +8,7 @@ import variables from '../variables'; */ export default function getCardStyles(isSmallScreenWidth, screenWidth) { return { - position: 'fixed', width: isSmallScreenWidth ? screenWidth : variables.sideBarWidth, - right: 0, - height: '100%', + alignSelf: 'flex-end', }; } diff --git a/src/styles/getNavigationModalCardStyles/getBaseNavigationModalCardStyles.js b/src/styles/getNavigationModalCardStyles/getBaseNavigationModalCardStyles.js index 1e3634cff83aa..cb66f80522812 100644 --- a/src/styles/getNavigationModalCardStyles/getBaseNavigationModalCardStyles.js +++ b/src/styles/getNavigationModalCardStyles/getBaseNavigationModalCardStyles.js @@ -1,10 +1,7 @@ import variables from '../variables'; export default isSmallScreenWidth => ({ - position: 'absolute', - top: 0, - right: 0, width: isSmallScreenWidth ? '100%' : variables.sideBarWidth, backgroundColor: 'transparent', - height: '100%', + alignSelf: 'flex-end', }); diff --git a/src/styles/styles.js b/src/styles/styles.js index 0d4e97012dec6..bc67c1e557723 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2074,7 +2074,6 @@ const styles = { navigationScreenCardStyle: { backgroundColor: themeColors.appBG, - height: '100%', }, navigationSceneFullScreenWrapper: {