Merge pull request #19744 from kidroca/kidroca/fix/base-modal-oversight

Fix bug in global modal state management during unmounting
Expensify · Jun 6, 2023 · 08b1bf6 · 08b1bf6
2 parents 8ac1e94 + 1e99974
commit 08b1bf6
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
@@ -51,10 +51,9 @@ class BaseModal extends PureComponent {
     }
 
     componentWillUnmount() {
-        // we don't want to call the onModalHide on unmount
-        this.hideModal(this.props.isVisible);
-
+        // Only trigger onClose and setModalVisibility if the modal is unmounting while visible.
         if (this.props.isVisible) {
+            this.hideModal(true);
             Modal.willAlertModalBecomeVisible(false);
         }