From 7f2af77efbc40f6ef22dce182d7a73ce40b582fa Mon Sep 17 00:00:00 2001
From: Joe Gambino <jgambino96@gmail.com>
Date: Mon, 29 Nov 2021 16:21:20 -0800
Subject: [PATCH] Revert "Supports big screens mobile devices for popover menu"

---
 src/components/Popover/index.native.js        | 25 +++++++++++--------
 src/components/PopoverMenu/BasePopoverMenu.js |  1 -
 src/pages/home/sidebar/SidebarScreen.js       |  1 -
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/Popover/index.native.js b/src/components/Popover/index.native.js
index 6f560aa8a14f..1c8883220d14 100644
--- a/src/components/Popover/index.native.js
+++ b/src/components/Popover/index.native.js
@@ -13,17 +13,20 @@ const propTypes = {
  * This is a convenience wrapper around the Modal component for a responsive Popover.
  * On small screen widths, it uses BottomDocked modal type, and a Popover type on wide screen widths.
  */
-const Popover = props => (
-    <Modal
-        type={props.isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.POPOVER}
-        popoverAnchorPosition={props.isSmallScreenWidth ? undefined : props.anchorPosition}
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        fullscreen={props.isSmallScreenWidth ? true : props.fullscreen}
-        animationIn={props.isSmallScreenWidth ? undefined : props.animationIn}
-        animationOut={props.isSmallScreenWidth ? undefined : props.animationOut}
-    />
-);
+const Popover = (props) => {
+    const propsWithoutAnimation = _.omit(props, ['animationIn', 'animationOut', 'popoverAnchorPosition', 'disableAnimation']);
+    return (
+        <Modal
+            type={CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...propsWithoutAnimation}
+
+            // Mobile will always has fullscreen menu
+            // eslint-disable-next-line react/jsx-props-no-multi-spaces
+            fullscreen
+        />
+    );
+};
 
 Popover.propTypes = propTypes;
 Popover.defaultProps = defaultProps;
diff --git a/src/components/PopoverMenu/BasePopoverMenu.js b/src/components/PopoverMenu/BasePopoverMenu.js
index 177c007eb8b9..496c8ab97041 100644
--- a/src/components/PopoverMenu/BasePopoverMenu.js
+++ b/src/components/PopoverMenu/BasePopoverMenu.js
@@ -35,7 +35,6 @@ class BasePopoverMenu extends PureComponent {
                 onModalHide={this.props.onMenuHide}
                 animationIn={this.props.animationIn}
                 animationOut={this.props.animationOut}
-                isSmallScreenWidth={this.props.isSmallScreenWidth}
                 disableAnimation={this.props.disableAnimation}
             >
                 <View style={this.props.isSmallScreenWidth ? {} : styles.createMenuContainer}>
diff --git a/src/pages/home/sidebar/SidebarScreen.js b/src/pages/home/sidebar/SidebarScreen.js
index 28d332648d8b..d678eeb81fba 100755
--- a/src/pages/home/sidebar/SidebarScreen.js
+++ b/src/pages/home/sidebar/SidebarScreen.js
@@ -148,7 +148,6 @@ class SidebarScreen extends Component {
                             isVisible={this.state.isCreateMenuActive}
                             anchorPosition={styles.createMenuPositionSidebar}
                             onItemSelected={this.onCreateMenuItemSelected}
-                            isSmallScreenWidth={this.props.isSmallScreenWidth}
                             menuItems={[
                                 {
                                     icon: Expensicons.ChatBubble,