diff --git a/packages/bruno-app/src/providers/App/ConfirmAppClose/SaveRequestsModal.js b/packages/bruno-app/src/providers/App/ConfirmAppClose/SaveRequestsModal.js index cb04256bd..9cdca4dbe 100644 --- a/packages/bruno-app/src/providers/App/ConfirmAppClose/SaveRequestsModal.js +++ b/packages/bruno-app/src/providers/App/ConfirmAppClose/SaveRequestsModal.js @@ -6,12 +6,11 @@ import { useSelector } from 'react-redux'; import { useDispatch } from 'react-redux'; import { findCollectionByUid, flattenItems, isItemARequest } from 'utils/collections'; import { pluralizeWord } from 'utils/common'; -import { completeQuitFlow } from 'providers/ReduxStore/slices/app'; import { saveMultipleRequests } from 'providers/ReduxStore/slices/collections/actions'; import { IconAlertTriangle } from '@tabler/icons'; import Modal from 'components/Modal'; -const SaveRequestsModal = ({ onClose }) => { +const SaveRequestsModal = ({ onConfirm, onClose }) => { const MAX_UNSAVED_REQUESTS_TO_SHOW = 5; const currentDrafts = []; const collections = useSelector((state) => state.collections.collections); @@ -35,18 +34,18 @@ const SaveRequestsModal = ({ onClose }) => { useEffect(() => { if (currentDrafts.length === 0) { - return dispatch(completeQuitFlow()); + return dispatch(onConfirm()); } }, [currentDrafts, dispatch]); const closeWithoutSave = () => { - dispatch(completeQuitFlow()); + dispatch(onConfirm()); onClose(); }; const closeWithSave = () => { dispatch(saveMultipleRequests(currentDrafts)) - .then(() => dispatch(completeQuitFlow())) + .then(() => dispatch(onConfirm())) .then(() => onClose()); }; diff --git a/packages/bruno-app/src/providers/App/ConfirmAppClose/index.js b/packages/bruno-app/src/providers/App/ConfirmAppClose/index.js index 15a361367..bde285517 100644 --- a/packages/bruno-app/src/providers/App/ConfirmAppClose/index.js +++ b/packages/bruno-app/src/providers/App/ConfirmAppClose/index.js @@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'; import { useDispatch } from 'react-redux'; import SaveRequestsModal from './SaveRequestsModal'; import { isElectron } from 'utils/common/platform'; +import { completeQuitFlow } from 'providers/ReduxStore/slices/app'; const ConfirmAppClose = () => { const { ipcRenderer } = window; @@ -26,7 +27,7 @@ const ConfirmAppClose = () => { return null; } - return setShowConfirmClose(false)} />; + return setShowConfirmClose(false)} />; }; export default ConfirmAppClose;