From b57fcbe0f099778eaaef3da76cc47d1bf9b7070b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20Alc=C3=A1ntara?= <alfredo@lunadna.com>
Date: Wed, 1 Dec 2021 15:52:06 -0800
Subject: [PATCH 1/4] Handle popover showing from side only in sidebar screen

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

diff --git a/src/components/Popover/index.native.js b/src/components/Popover/index.native.js
index 6f560aa8a14f..234baf362f58 100644
--- a/src/components/Popover/index.native.js
+++ b/src/components/Popover/index.native.js
@@ -15,7 +15,7 @@ const propTypes = {
  */
 const Popover = props => (
     <Modal
-        type={props.isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.POPOVER}
+        type={props.fromSidebarMediumScreen ? CONST.MODAL.MODAL_TYPE.POPOVER : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
         popoverAnchorPosition={props.isSmallScreenWidth ? undefined : props.anchorPosition}
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
diff --git a/src/components/PopoverMenu/BasePopoverMenu.js b/src/components/PopoverMenu/BasePopoverMenu.js
index 177c007eb8b9..9991da87e9c0 100644
--- a/src/components/PopoverMenu/BasePopoverMenu.js
+++ b/src/components/PopoverMenu/BasePopoverMenu.js
@@ -37,6 +37,7 @@ class BasePopoverMenu extends PureComponent {
                 animationOut={this.props.animationOut}
                 isSmallScreenWidth={this.props.isSmallScreenWidth}
                 disableAnimation={this.props.disableAnimation}
+                fromSidebarMediumScreen={this.props.fromSidebarMediumScreen}
             >
                 <View style={this.props.isSmallScreenWidth ? {} : styles.createMenuContainer}>
                     {!_.isEmpty(this.props.headerText) && (
diff --git a/src/pages/home/sidebar/SidebarScreen.js b/src/pages/home/sidebar/SidebarScreen.js
index a0253ed0663f..45e80597d148 100755
--- a/src/pages/home/sidebar/SidebarScreen.js
+++ b/src/pages/home/sidebar/SidebarScreen.js
@@ -156,6 +156,7 @@ class SidebarScreen extends Component {
                             anchorPosition={styles.createMenuPositionSidebar}
                             onItemSelected={this.onCreateMenuItemSelected}
                             isSmallScreenWidth={this.props.isSmallScreenWidth}
+                            fromSidebarMediumScreen={this.props.isMediumScreenWidth}
                             menuItems={[
                                 {
                                     icon: ChatBubble,

From f2606087f069e1f85bd77c15f8d43462817fae47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20Alc=C3=A1ntara?= <alfredo@lunadna.com>
Date: Thu, 9 Dec 2021 19:30:09 -0800
Subject: [PATCH 2/4] Send correct value

---
 src/pages/home/sidebar/SidebarScreen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/sidebar/SidebarScreen.js b/src/pages/home/sidebar/SidebarScreen.js
index 9520322445ce..b9fce6631381 100755
--- a/src/pages/home/sidebar/SidebarScreen.js
+++ b/src/pages/home/sidebar/SidebarScreen.js
@@ -149,7 +149,7 @@ class SidebarScreen extends Component {
                             anchorPosition={styles.createMenuPositionSidebar}
                             onItemSelected={this.onCreateMenuItemSelected}
                             isSmallScreenWidth={this.props.isSmallScreenWidth}
-                            fromSidebarMediumScreen={this.props.isMediumScreenWidth}
+                            fromSidebarMediumScreen={!this.props.isSmallScreenWidth}
                             menuItems={[
                                 {
                                     icon: Expensicons.ChatBubble,

From d07d3d0506c5b1c776331d164cad11f3fabba87f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20Alc=C3=A1ntara?= <alfredo@lunadna.com>
Date: Thu, 9 Dec 2021 19:30:51 -0800
Subject: [PATCH 3/4] Sends correct animations

---
 src/components/Popover/index.native.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/Popover/index.native.js b/src/components/Popover/index.native.js
index 234baf362f58..05c193bbad71 100644
--- a/src/components/Popover/index.native.js
+++ b/src/components/Popover/index.native.js
@@ -13,17 +13,21 @@ 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.fromSidebarMediumScreen ? CONST.MODAL.MODAL_TYPE.POPOVER : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
-        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={props.fromSidebarMediumScreen ? CONST.MODAL.MODAL_TYPE.POPOVER : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
+            popoverAnchorPosition={props.fromSidebarMediumScreen ? props.anchorPosition : undefined}
+            // 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;

From 077c4a54645680321425e4b173e7f6688bebf2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20Alc=C3=A1ntara?= <alfredo@lunadna.com>
Date: Thu, 9 Dec 2021 19:34:51 -0800
Subject: [PATCH 4/4] Send relevant props

---
 src/pages/home/sidebar/SidebarScreen.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/sidebar/SidebarScreen.js b/src/pages/home/sidebar/SidebarScreen.js
index b9fce6631381..8c0d15c79fa4 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}
                             fromSidebarMediumScreen={!this.props.isSmallScreenWidth}
                             menuItems={[
                                 {