Merge branch 'develop' into caip-multichain

MetaMask · Oct 1, 2024 · b6ca49a · b6ca49a
2 parents 15f622a + 5639952
commit b6ca49a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,6 +10,7 @@ on:
       - opened
       - reopened
       - synchronize
+  merge_group:
 
 jobs:
   test-unit:

diff --git a/ui/pages/swaps/smart-transaction-status/index.scss b/ui/pages/swaps/smart-transaction-status/index.scss
@@ -36,26 +36,13 @@
     width: 100%;
   }
 
-  &__background-animation {
-    position: relative;
-    left: -88px;
-    background-repeat: repeat;
-    background-position: 0 0;
-
+  &__spacer-box {
     &--top {
-      width: 1634px;
       height: 54px;
-      background-size: 817px 54px;
-      background-image: url('/images/transaction-background-top.svg');
-      animation: shift 19s linear infinite;
     }
 
     &--bottom {
-      width: 1600px;
       height: 62px;
-      background-size: 800px 62px;
-      background-image: url('/images/transaction-background-bottom.svg');
-      animation: shift 22s linear infinite;
     }
   }
 

diff --git a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@@ -365,7 +365,7 @@ export default function SmartTransactionStatusPage() {
         </Box>
         <Box
           marginTop={3}
-          className="smart-transaction-status__background-animation smart-transaction-status__background-animation--top"
+          className="smart-transaction-status__spacer-box--top"
         />
         {icon && (
           <Box marginTop={3} marginBottom={2}>
@@ -440,7 +440,7 @@ export default function SmartTransactionStatusPage() {
         )}
         <Box
           marginTop={3}
-          className="smart-transaction-status__background-animation smart-transaction-status__background-animation--bottom"
+          className="smart-transaction-status__spacer-box--bottom"
         />
         {subDescription && (
           <Text