Merge branch 'develop' into test-scenarios

MetaMask · Sep 11, 2023 · 76e7e89 · 76e7e89
2 parents cc98e75 + e44887c
commit 76e7e89
Show file tree

Hide file tree

Showing 36 changed files with 439 additions and 1,834 deletions.
diff --git a/.storybook/initial-states/transactions.js b/.storybook/initial-states/transactions.js
@@ -72,37 +72,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         },
         type: 'cancel',
       },
-      [
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 81,
-              highestSuggested: 81,
-              nextNetworkNonce: 81,
-            },
-            local: {
-              name: 'local',
-              nonce: 83,
-              details: {
-                startPoint: 81,
-                highest: 83,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 81,
-              details: {
-                blockNumber: '0xa3e3ac',
-                baseCount: 81,
-              },
-            },
-          },
-          note: 'transactions#approveTransaction',
-          timestamp: 1653527035723,
-        },
-      ],
       [
         {
           op: 'add',
@@ -172,29 +141,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         },
       ],
     ],
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 81,
-        highestSuggested: 81,
-        nextNetworkNonce: 81,
-      },
-      local: {
-        name: 'local',
-        nonce: 83,
-        details: {
-          startPoint: 81,
-          highest: 83,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 81,
-        details: {
-          blockNumber: '0xa3e3ac',
-          baseCount: 81,
-        },
-      },
-    },
     r: '0xb66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347',
     s: '0x3a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
     v: '0x2b',
@@ -402,37 +348,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         type: 'retry',
         estimatedBaseFee: 'd',
       },
-      [
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 7,
-              highestSuggested: 7,
-              nextNetworkNonce: 7,
-            },
-            local: {
-              name: 'local',
-              nonce: 10,
-              details: {
-                startPoint: 7,
-                highest: 10,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 7,
-              details: {
-                blockNumber: '0xa3d235',
-                baseCount: 7,
-              },
-            },
-          },
-          note: 'transactions#approveTransaction',
-          timestamp: 1653459456415,
-        },
-      ],
       [
         {
           op: 'add',
@@ -497,29 +412,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         },
       ],
     ],
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 7,
-        highestSuggested: 7,
-        nextNetworkNonce: 7,
-      },
-      local: {
-        name: 'local',
-        nonce: 10,
-        details: {
-          startPoint: 7,
-          highest: 10,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 7,
-        details: {
-          blockNumber: '0xa3d235',
-          baseCount: 7,
-        },
-      },
-    },
     r: '0xde2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26',
     s: '0x64ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
     v: '0x00',
@@ -778,33 +670,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
           note: 'transactions#approveTransaction',
           timestamp: 1653457117294,
         },
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 5,
-              highestSuggested: 5,
-              nextNetworkNonce: 5,
-            },
-            local: {
-              name: 'local',
-              nonce: 5,
-              details: {
-                startPoint: 5,
-                highest: 5,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 5,
-              details: {
-                blockNumber: '0xa3d19b',
-                baseCount: 5,
-              },
-            },
-          },
-        },
       ],
       [
         {
@@ -883,29 +748,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
       maxPriorityFeePerGas: '0x4a817c800',
     },
     estimatedBaseFee: '14',
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 5,
-        highestSuggested: 5,
-        nextNetworkNonce: 5,
-      },
-      local: {
-        name: 'local',
-        nonce: 5,
-        details: {
-          startPoint: 5,
-          highest: 5,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 5,
-        details: {
-          blockNumber: '0xa3d19b',
-          baseCount: 5,
-        },
-      },
-    },
     r: '0xfdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0',
     s: '0x54c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
     v: '0x00',
@@ -949,29 +791,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
       maxPriorityFeePerGas: '0x3B9ACA00',
     },
     estimatedBaseFee: '3ba182755',
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 87,
-        highestSuggested: 87,
-        nextNetworkNonce: 87,
-      },
-      local: {
-        name: 'local',
-        nonce: 87,
-        details: {
-          startPoint: 87,
-          highest: 87,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 87,
-        details: {
-          blockNumber: '0xa28e38',
-          baseCount: 87,
-        },
-      },
-    },
     r: '0xd13310569a8d5876e37788183034bfe4bc3b49c0663c5fd9b2bf13adf9b4791c',
     s: '0x7a83d8840e7edcdf4fdedfd2bc1ce19775e54fd17f29ede5165591a1cf3febea',
     v: '0x00',
@@ -1156,33 +975,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
           note: 'transactions#approveTransaction',
           timestamp: 1653457091939,
         },
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 4,
-              highestSuggested: 4,
-              nextNetworkNonce: 4,
-            },
-            local: {
-              name: 'local',
-              nonce: 4,
-              details: {
-                startPoint: 4,
-                highest: 4,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 4,
-              details: {
-                blockNumber: '0xa3d198',
-                baseCount: 4,
-              },
-            },
-          },
-        },
       ],
       [
         {
@@ -1370,29 +1162,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
       maxPriorityFeePerGas: '0x4a817c800',
     },
     estimatedBaseFee: '16',
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 4,
-        highestSuggested: 4,
-        nextNetworkNonce: 4,
-      },
-      local: {
-        name: 'local',
-        nonce: 4,
-        details: {
-          startPoint: 4,
-          highest: 4,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 4,
-        details: {
-          blockNumber: '0xa3d198',
-          baseCount: 4,
-        },
-      },
-    },
     r: '0xb0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bce',
     s: '0x08e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
     v: '0x01',
@@ -1591,33 +1360,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
           note: 'transactions#approveTransaction',
           timestamp: 1653457330354,
         },
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 6,
-              highestSuggested: 6,
-              nextNetworkNonce: 6,
-            },
-            local: {
-              name: 'local',
-              nonce: 6,
-              details: {
-                startPoint: 6,
-                highest: 6,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 6,
-              details: {
-                blockNumber: '0xa3d1a8',
-                baseCount: 6,
-              },
-            },
-          },
-        },
       ],
       [
         {
@@ -1829,29 +1571,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
       maxPriorityFeePerGas: '0x59682f00',
     },
     estimatedBaseFee: 'd',
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 6,
-        highestSuggested: 6,
-        nextNetworkNonce: 6,
-      },
-      local: {
-        name: 'local',
-        nonce: 6,
-        details: {
-          startPoint: 6,
-          highest: 6,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 6,
-        details: {
-          blockNumber: '0xa3d1a8',
-          baseCount: 6,
-        },
-      },
-    },
     r: '0x58294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdc',
     s: '0x3993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
     v: '0x01',