Merge branch 'develop' into fix-fa-e

MetaMask · Feb 17, 2023 · 223b2f6 · 223b2f6
2 parents fed06a3 + 3fa167e
commit 223b2f6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/ui/components/app/tab-bar/index.scss b/ui/components/app/tab-bar/index.scss
@@ -68,10 +68,6 @@
         margin-inline-end: 16px;
         flex: 0 0 18px;
         color: var(--color-icon-alternative);
-
-        @include screen-sm-min {
-          flex: 0 0 14px;
-        }
       }
     }
 

diff --git a/ui/hooks/useShouldAnimateGasEstimations.js b/ui/hooks/useShouldAnimateGasEstimations.js
@@ -44,13 +44,18 @@ export function useShouldAnimateGasEstimations() {
   }, [dispatch, isGasLoadingAnimationActive, showLoadingAnimation]);
 
   useEffect(() => {
-    if (
-      isGasLoadingAnimationActive === true &&
-      showLoadingAnimation === false
-    ) {
-      setTimeout(() => {
+    let timer;
+
+    if (isGasLoadingAnimationActive && !showLoadingAnimation) {
+      timer = setTimeout(() => {
         dispatch(toggleGasLoadingAnimation(false));
       }, 2000);
     }
+
+    return () => {
+      if (timer) {
+        clearTimeout(timer);
+      }
+    };
   }, [dispatch, isGasLoadingAnimationActive, showLoadingAnimation]);
 }
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -866,6 +866,10 @@ export default class ConfirmTransactionBase extends Component {
         sendTransaction(txData)
           .then(() => {
             clearConfirmTransaction();
+            if (!this._isMounted) {
+              return;
+            }
+
             this.setState(
               {
                 submitting: false,
@@ -877,6 +881,10 @@ export default class ConfirmTransactionBase extends Component {
             );
           })
           .catch((error) => {
+            if (!this._isMounted) {
+              return;
+            }
+
             this.setState({
               submitting: false,
               submitError: error.message,