fix: system popup take precedence over discovery popup (#1439)

uc-cdis · Oct 18, 2023 · 3323ff8 · 3323ff8
1 parent 44c6617
commit 3323ff8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Discovery/DiscoveryActionBar.tsx b/src/Discovery/DiscoveryActionBar.tsx
@@ -54,6 +54,7 @@ interface Props {
     actionToResume: 'download'|'export'|'manifest';
     selectedResources: any[];
   };
+  systemPopupActivated: boolean;
   onActionResumed: () => any
 }
 
@@ -572,7 +573,7 @@ const DiscoveryActionBar = (props: Props) => {
         </Popover>
         <Modal
           closable={false}
-          open={downloadStatus.message.active}
+          open={downloadStatus.message.active && !props.systemPopupActivated}
           title={downloadStatus.message.title}
           footer={(
             <Button

diff --git a/src/Discovery/reduxer.js b/src/Discovery/reduxer.js
@@ -6,6 +6,7 @@ export const ReduxDiscoveryActionBar = (() => {
   const mapStateToProps = (state) => ({
     user: state.user,
     discovery: state.discovery,
+    systemPopupActivated: !!state.popups?.systemUseWarnPopup,
   });
 
   const mapDispatchToProps = (dispatch) => ({