fix: modals

binary-com · Feb 9, 2023 · 1388950 · 1388950
1 parent 25e1024
commit 1388950
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/packages/p2p/src/components/daily-limit-modal/daily-limit-modal.jsx b/packages/p2p/src/components/daily-limit-modal/daily-limit-modal.jsx
@@ -9,6 +9,7 @@ const DailyLimitModal = () => {
 
     return (
         <Modal
+            exit_classname='daily-limit-modal--exit'
             is_open={my_profile_store.is_daily_limit_modal_open}
             small
             has_close_icon={false}
@@ -36,9 +37,7 @@ const DailyLimitModal = () => {
                     text={localize('Yes, continue')}
                     onClick={() => {
                         my_profile_store.setIsDailyLimitModalOpen(false);
-
-                        clearTimeout(delay);
-                        const delay = setTimeout(() => my_profile_store.setIsLoadingModalOpen(true), 250);
+                        my_profile_store.setIsLoadingModalOpen(true);
                         my_profile_store.upgradeDailyLimit();
                     }}
                     primary

diff --git a/packages/p2p/src/components/daily-limit-modal/daily-limit-modal.scss b/packages/p2p/src/components/daily-limit-modal/daily-limit-modal.scss
@@ -0,0 +1,3 @@
+.daily-limit-modal--exit {
+    display: none;
+}
diff --git a/packages/p2p/src/components/daily-limit-modal/index.js b/packages/p2p/src/components/daily-limit-modal/index.js
@@ -1,3 +1,4 @@
 import DailyLimitModal from './daily-limit-modal.jsx';
+import './daily-limit-modal.scss';
 
 export default DailyLimitModal;
diff --git a/packages/p2p/src/components/loading-modal/index.js b/packages/p2p/src/components/loading-modal/index.js
@@ -1,3 +1,4 @@
 import LoadingModal from './loading-modal.jsx';
+import './loading-modal.scss';
 
 export default LoadingModal;
diff --git a/packages/p2p/src/components/loading-modal/loading-modal.jsx b/packages/p2p/src/components/loading-modal/loading-modal.jsx
@@ -4,7 +4,13 @@ import { Loading, Modal } from '@deriv/components';
 
 const LoadingModal = ({ is_loading_modal_open }) => {
     return (
-        <Modal has_close_icon={false} is_open={is_loading_modal_open} small width='440px'>
+        <Modal
+            exit_classname='loading-modal--exit'
+            has_close_icon={false}
+            is_open={is_loading_modal_open}
+            small
+            width='440px'
+        >
             <Loading is_fullscreen={false} />
         </Modal>
     );

diff --git a/packages/p2p/src/components/loading-modal/loading-modal.scss b/packages/p2p/src/components/loading-modal/loading-modal.scss
@@ -0,0 +1,3 @@
+.loading-modal--exit {
+    display: none;
+}
diff --git a/packages/p2p/src/stores/my-profile-store.js b/packages/p2p/src/stores/my-profile-store.js
@@ -850,8 +850,7 @@ export default class MyProfileStore extends BaseStore {
 
         requestWS({ p2p_advertiser_update: 1, upgrade_limits: 1 }).then(response => {
             if (response) {
-                clearTimeout(delay);
-                const delay = setTimeout(() => this.setIsLoadingModalOpen(false), 250);
+                this.setIsLoadingModalOpen(false);
 
                 if (response.error) {
                     clearTimeout(wait);