fix: global modal not showing sometimes

HathorNetwork · Dec 23, 2024 · 3909e12 · 3909e12
1 parent dc15386
commit 3909e12
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/config-overrides.js b/config-overrides.js
@@ -91,10 +91,6 @@ module.exports = function override(config, env) {
       process: 'process/browser',
       Buffer: ['buffer-shim', 'default']
     }),
-    new webpack.DefinePlugin({
-      'process.env': JSON.stringify(process.env),
-      'global': 'window'
-    })
   ];
 
   return config;

diff --git a/patches/elliptic++bn.js+4.12.0.patch b/patches/elliptic++bn.js+4.12.0.patch
@@ -1,8 +1,7 @@
 diff --git a/node_modules/elliptic/node_modules/bn.js/lib/bn.js b/node_modules/elliptic/node_modules/bn.js/lib/bn.js
-index 3a4371e..629ed9c 100644
 --- a/node_modules/elliptic/node_modules/bn.js/lib/bn.js
 +++ b/node_modules/elliptic/node_modules/bn.js/lib/bn.js
-@@ -48,12 +48,14 @@
+@@ -48,14 +48,16 @@
    BN.BN = BN;
    BN.wordSize = 26;
 
@@ -13,16 +12,18 @@ index 3a4371e..629ed9c 100644
 -      Buffer = window.Buffer;
 -    } else {
 -      Buffer = require('buffer').Buffer;
+-    }
 +    var customBuffer = require('../../../../../src/buffer-shim');
 +    BNBuffer = customBuffer.Buffer || customBuffer.default;
-+  } catch (e) {
+   } catch (e) {
 +    try {
 +      BNBuffer = require('buffer/').Buffer;
 +    } catch (e2) {
 +      BNBuffer = null;
-     }
++    }
    }
 
+   BN.isBN = function isBN (num) {
 @@ -526,8 +528,8 @@
    };
 

diff --git a/src/components/GlobalModal.js b/src/components/GlobalModal.js
@@ -124,8 +124,12 @@ export const GlobalModal = ({ children }) => {
     }
   };
 
-  const showModal = (modalType, modalProps = {}) => {
-    console.log('Will show modal (global).');
+  /* Without this setTimeout, calling showModal right after hiding an existing
+   * modal will not display the backdrop due to a race condition. setTimeout
+   * sends this method to the end of the event loop, making sure that it is
+   * executed after the previous jquery calls
+   */
+  const showModal = (modalType, modalProps = {}) => setTimeout(() => {
     setStore({
       ...store,
       modalType,
@@ -135,10 +139,8 @@ export const GlobalModal = ({ children }) => {
     // Sometimes the modal backdrop won't show up again after being
     // removed forcefully by the hideModal, so we should just show it
     // again.
-    const modal = $('.modal-backdrop');
-    console.log('modal:', modal);
     $('.modal-backdrop').fadeIn(150);
-  };
+  }, 0);
 
   /**
    * Helper method to handle the modal's DOM lifecycle: showing the modal and