Merge remote-tracking branch origin/master into gregs/bx-1575-show-po…

…pular-in-rainbow-tokens
rainbow-me · Oct 3, 2024 · 8b75994 · 8b75994
2 parents 98186b9 + 10e27f5
commit 8b75994
Show file tree

Hide file tree

Showing 185 changed files with 1,220 additions and 555 deletions.
diff --git a/audit-ci.jsonc b/audit-ci.jsonc
@@ -13,7 +13,6 @@
     "GHSA-353f-5xf4-qw67",
     "GHSA-j8xg-fqg3-53r7",
     "GHSA-67hx-6x53-jw92",
-    "GHSA-c24v-8rfc-w8vw",
-    "GHSA-m95q-7qp3-xv42"
+    "GHSA-c24v-8rfc-w8vw"
   ]
 }
diff --git a/e2e/serial/swap/1_swapFlow1.test.ts b/e2e/serial/swap/1_swapFlow1.test.ts
@@ -1,7 +1,7 @@
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import 'chromedriver';
 import 'geckodriver';
-import { WebDriver } from 'selenium-webdriver';
+import { Key, WebDriver } from 'selenium-webdriver';
 import { afterAll, afterEach, beforeAll, beforeEach, expect, it } from 'vitest';
 
 import { ChainId } from '~/core/types/chains';
@@ -222,14 +222,16 @@ it('should be able to interact with slippage settings', async () => {
     id: 'explainer-action-button',
     driver,
   });
-  await clearInput({
+  await typeOnTextInput({
     id: 'slippage-input-mask',
     driver,
+    text: Key.BACK_SPACE,
   });
+  await delayTime('short');
   await typeOnTextInput({
     id: 'slippage-input-mask',
     driver,
-    text: '4',
+    text: '5',
   });
   await delayTime('short');
   const warning = await findElementByTestId({
@@ -1005,11 +1007,12 @@ it('should be able to execute swap', async () => {
     id: 'swap-settings-navbar-button',
     driver,
   });
-  await delayTime('short');
-  await clearInput({
+  await typeOnTextInput({
     id: 'slippage-input-mask',
     driver,
+    text: Key.BACK_SPACE,
   });
+  await delayTime('short');
   await typeOnTextInput({
     id: 'slippage-input-mask',
     driver,

diff --git a/e2e/serial/swap/2_swapFlow2.test.ts b/e2e/serial/swap/2_swapFlow2.test.ts
@@ -2,7 +2,7 @@ import 'chromedriver';
 import 'geckodriver';
 import { Contract } from '@ethersproject/contracts';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
-import { WebDriver } from 'selenium-webdriver';
+import { Key, WebDriver } from 'selenium-webdriver';
 import { erc20Abi } from 'viem';
 import {
   afterAll,
@@ -154,6 +154,7 @@ describe('Swap Flow 2', () => {
       id: `${SWAP_VARIABLES.USDC_MAINNET_ID}-token-to-sell-swap-token-input-swap-input-mask`,
       driver,
     });
+    await delayTime('medium');
     await typeOnTextInput({
       id: `${SWAP_VARIABLES.USDC_MAINNET_ID}-token-to-sell-swap-token-input-swap-input-mask`,
       text: `\b50`,
@@ -181,10 +182,13 @@ describe('Swap Flow 2', () => {
       driver,
     });
     await delayTime('short');
-    await clearInput({
+
+    await typeOnTextInput({
       id: 'slippage-input-mask',
       driver,
+      text: Key.BACK_SPACE,
     });
+    await delayTime('short');
     await typeOnTextInput({
       id: 'slippage-input-mask',
       driver,

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "browser-extension",
   "license": "GPL-3.0-only",
-  "version": "1.5.41",
+  "version": "1.5.46",
   "scripts": {
     "//enable dev mode": "",
     "devmode:on": "sed -i'' -e 's/IS_DEV.*/IS_DEV=true/g' .env",
@@ -96,10 +96,8 @@
     "@ethersproject/transactions": "5.7.0",
     "@ethersproject/units": "5.7.0",
     "@ethersproject/wallet": "5.7.0",
-    "@ledgerhq/evm-tools": "1.2.0",
-    "@ledgerhq/hw-app-eth": "6.38.0",
-    "@ledgerhq/hw-transport-webhid": "6.28.2",
-    "@ledgerhq/live-network": "1.4.0",
+    "@ledgerhq/hw-app-eth": "6.38.1",
+    "@ledgerhq/hw-transport-webhid": "6.29.3",
     "@metamask/browser-passworder": "4.1.0",
     "@metamask/eth-sig-util": "7.0.1",
     "@radix-ui/react-accordion": "1.1.2",
@@ -281,7 +279,9 @@
     "micromatch": "4.0.8",
     "webpack": "5.94.0",
     "path-to-regexp": "6.3.0",
-    "dset": "3.1.4"
+    "dset": "3.1.4",
+    "zod": "3.23.8",
+    "rollup": "4.22.4"
   },
   "lavamoat": {
     "allowScripts": {