Merge branch 'master' into nj/fix/custom-assets-upsert

FuelLabs · Jan 3, 2025 · 5dcc614 · 5dcc614
2 parents dc67437 + 7cfef80
commit 5dcc614
Show file tree

Hide file tree

Showing 47 changed files with 775 additions and 487 deletions.
diff --git a/.github/workflows/pr-tests-e2e-assets.yml b/.github/workflows/pr-tests-e2e-assets.yml
@@ -12,8 +12,8 @@ concurrency:
 jobs:
   tests-e2e-assets:
     name: Test
-    timeout-minutes: 10
     runs-on: buildjet-8vcpu-ubuntu-2204
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
       - uses: FuelLabs/github-actions/setups/node@master

diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "test:e2e": "NODE_ENV=test pnpm build:crx && playwright test --config=packages/app/playwright.config.ts --project=chromium",
     "test:e2e:beta": "NODE_ENV=test pnpm build:crx && playwright test --config=packages/app/playwright.config.ts --project=chrome-beta",
     "test:e2e:crx-lock": "NODE_ENV=test pnpm build:crx && playwright test --config=packages/app/playwright.crx-lock.config.ts",
-    "test:e2e:assets": "NODE_ENV=test pnpm playwright test --config=packages/e2e-assets/playwright.config.ts",
+    "test:e2e:assets": "NODE_ENV=test pnpm playwright test --config=packages/app/playwright.assets.config.ts",
     "test:e2e:contracts": "NODE_ENV=test pnpm build:crx && pnpm --filter=@fuel-wallet/e2e-contract-tests test:e2e",
     "test:appfile": "pnpm --filter=fuels-wallet test --",
     "ts:check": "turbo run ts:check",
@@ -69,7 +69,7 @@
     "@biomejs/biome": "1.9.4",
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
-    "@fuels/ts-config": "0.20.0",
+    "@fuels/ts-config": "0.26.0",
     "@jest/types": "29.6.3",
     "@playwright/test": "1.46.1",
     "@types/jest": "^29.5.5",

diff --git a/packages/app/.env.example b/packages/app/.env.example
@@ -2,7 +2,7 @@ VITE_CRX_NAME="Fuel Wallet Development"
 VITE_CRX_VERSION_API="https://fuellabs.github.io/fuels-wallet/latest.json"
 VITE_FUEL_PROVIDER_URL=http://localhost:4000/v1/graphql
 VITE_FUEL_FAUCET_URL=http://localhost:4040
-VITE_EXPLORER_URL=https://app.fuel.network/
+VITE_ECOSYSTEM_PROJECTS_URL=https://fuellabs.github.io/fuel-ecosystem/projects.json
 VITE_MNEMONIC_WORDS=12
 GENESIS_SECRET=0xa449b1ffee0e2205fa924c6740cc48b3b473aa28587df6dab12abc245d1f5298
 VITE_AUTO_LOCK_IN_MINUTES=1

diff --git a/packages/app/.env.production b/packages/app/.env.production
@@ -3,7 +3,7 @@ VITE_CRX_VERSION_API="https://fuellabs.github.io/fuels-wallet/latest.json"
 VITE_CRX_RELEASE=true
 VITE_FUEL_PROVIDER_URL=https://testnet.fuel.network/v1/graphql
 VITE_FUEL_FAUCET_URL=https://faucet-testnet.fuel.network/
-VITE_EXPLORER_URL=https://app.fuel.network/
+VITE_ECOSYSTEM_PROJECTS_URL=https://fuellabs.github.io/fuel-ecosystem/projects.json
 VITE_MNEMONIC_WORDS=12
 VITE_AUTO_LOCK_IN_MINUTES=2880
 VITE_SENTRY_DSN=https://f9a5b923067f4f789fb40ed7eccd6486@o4505280621707264.ingest.sentry.io/4505280648577024
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
@@ -1,5 +1,45 @@
 # fuels-wallet
 
+## 0.46.1
+
+### Patch Changes
+
+- [#1753](https://github.com/FuelLabs/fuels-wallet/pull/1753) [`22975202`](https://github.com/FuelLabs/fuels-wallet/commit/22975202ae37ca941f27df825bdea11905cf3ddb) Thanks [@LuizAsFight](https://github.com/LuizAsFight)! - chore: remove comment
+
+- Updated dependencies []:
+  - @fuel-wallet/connections@0.46.1
+  - @fuels/playwright-utils@0.46.1
+
+## 0.46.0
+
+### Minor Changes
+
+- [#1749](https://github.com/FuelLabs/fuels-wallet/pull/1749) [`9cb81db2`](https://github.com/FuelLabs/fuels-wallet/commit/9cb81db28009f9879f31eefefe0e08f806bae5f2) Thanks [@helciofranco](https://github.com/helciofranco)! - Add contract logos and names to the transaction screen for better UX.
+
+### Patch Changes
+
+- [#1748](https://github.com/FuelLabs/fuels-wallet/pull/1748) [`cc953d4f`](https://github.com/FuelLabs/fuels-wallet/commit/cc953d4f62402895970140d243a3832a374aaa46) Thanks [@LuizAsFight](https://github.com/LuizAsFight)! - fix: clean opfs when logging out
+
+- Updated dependencies []:
+  - @fuel-wallet/connections@0.46.0
+  - @fuels/playwright-utils@0.46.0
+
+## 0.45.0
+
+### Minor Changes
+
+- [#1741](https://github.com/FuelLabs/fuels-wallet/pull/1741) [`197d1758`](https://github.com/FuelLabs/fuels-wallet/commit/197d1758701392bf7ab9efc97fbed3ca8d9ac567) Thanks [@nelitow](https://github.com/nelitow)! - Update @fuels packages to implement localStorage fix.
+
+### Patch Changes
+
+- [#1718](https://github.com/FuelLabs/fuels-wallet/pull/1718) [`7fcfee7d`](https://github.com/FuelLabs/fuels-wallet/commit/7fcfee7d8fb53259a8abd2f3843c951fcb03e865) Thanks [@nelitow](https://github.com/nelitow)! - Update E2E setup
+
+- [#1742](https://github.com/FuelLabs/fuels-wallet/pull/1742) [`4bd6e86b`](https://github.com/FuelLabs/fuels-wallet/commit/4bd6e86b370d17692da72ff91c2b28cb64a21c2c) Thanks [@LuizAsFight](https://github.com/LuizAsFight)! - feat: add OPFS backup
+
+- Updated dependencies [[`197d1758`](https://github.com/FuelLabs/fuels-wallet/commit/197d1758701392bf7ab9efc97fbed3ca8d9ac567)]:
+  - @fuels/playwright-utils@0.45.0
+  - @fuel-wallet/connections@0.45.0
+
 ## 0.44.1
 
 ### Patch Changes

diff --git a/packages/app/env.d.ts b/packages/app/env.d.ts
@@ -4,6 +4,7 @@ declare namespace NodeJS {
     VITE_DATABASE_VERSION: string;
     readonly VITE_FUEL_PROVIDER_URL: string;
     readonly VITE_FUEL_FAUCET_URL: string;
+    readonly VITE_ECOSYSTEM_PROJECTS_URL: string;
     readonly VITE_MNEMONIC_WORDS: string;
     readonly VITE_CRX_NAME: string;
     readonly VITE_CRX_VERSION_API: string;

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fuels-wallet",
   "private": true,
-  "version": "0.44.1",
+  "version": "0.46.1",
   "type": "module",
   "database": "23",
   "scripts": {
@@ -26,15 +26,14 @@
     "@fuel-ui/react": "0.23.3",
     "@fuel-ui/test-utils": "0.17.0",
     "@fuel-wallet/connections": "workspace:*",
-    "@fuels/local-storage": "0.20.0",
+    "@fuels/local-storage": "0.26.0",
     "@fuels/playwright-utils": "workspace:*",
     "@fuels/react-xstore": "0.20.0",
     "@hookform/resolvers": "3.9.0",
     "@react-aria/utils": "3.21.0",
     "@sentry/react": "8.33.1",
     "@storybook/addon-viewport": "7.4.6",
     "@storybook/jest": "0.2.3",
-    "@tanstack/react-query": "5.28.4",
     "@xstate/react": "3.2.2",
     "compare-versions": "6.1.0",
     "cross-fetch": "4.0.0",
@@ -84,7 +83,6 @@
     "@storybook/react-webpack5": "7.4.6",
     "@storybook/testing-library": "0.2.2",
     "@storybook/theming": "7.4.6",
-    "@tanstack/react-query-devtools": "5.28.4",
     "@testing-library/react": "14.0.0",
     "@types/chrome": "0.0.246",
     "@types/lodash.debounce": "4.0.7",

diff --git a/packages/app/playwright.assets.config.ts b/packages/app/playwright.assets.config.ts
@@ -0,0 +1,17 @@
+import { defineConfig, devices } from '@playwright/test';
+import { playwrightConfig } from './playwright.config';
+import './load.envs.cts';
+
+export default defineConfig({
+  ...playwrightConfig,
+  testMatch: 'playwright/crx/assets.test.ts',
+  testIgnore: undefined,
+  projects: [
+    {
+      name: 'chromium',
+      use: {
+        ...devices['Desktop Chromium'],
+      },
+    },
+  ],
+});
diff --git a/packages/app/playwright.config.ts b/packages/app/playwright.config.ts
@@ -49,7 +49,7 @@ export const playwrightConfig: PlaywrightTestConfig = {
       },
     },
   ],
-  testIgnore: ['playwright/crx/lock.test.ts'],
+  testIgnore: ['playwright/crx/lock.test.ts', 'playwright/crx/assets.test.ts'],
 };
 
 export default defineConfig(playwrightConfig);
diff --git a/.../e2e-assets/playwright/crx/assets.test.ts → packages/app/playwright/crx/assets.test.ts b/.../e2e-assets/playwright/crx/assets.test.ts → packages/app/playwright/crx/assets.test.ts
diff --git a/packages/app/src/config.ts b/packages/app/src/config.ts
@@ -11,11 +11,11 @@ export const {
   VITE_CRX_VERSION_API,
   VITE_AUTO_LOCK_IN_MINUTES,
   VITE_SENTRY_DSN,
-  VITE_EXPLORER_URL,
+  VITE_ECOSYSTEM_PROJECTS_URL,
   NODE_ENV,
 } = import.meta.env;
 
-export const EXPLORER_URL = VITE_EXPLORER_URL;
+export const ECOSYSTEM_PROJECTS_URL = VITE_ECOSYSTEM_PROJECTS_URL;
 export const WALLET_NAME = VITE_CRX_NAME;
 export const APP_VERSION = VITE_APP_VERSION;
 export const DATABASE_VERSION = Number(VITE_DATABASE_VERSION);

diff --git a/packages/app/src/networks.ts b/packages/app/src/networks.ts
@@ -1,17 +1,19 @@
 import type { NetworkData } from '@fuel-wallet/types';
 import { CHAIN_IDS } from 'fuels';
 
+export const IGNITION_NETWORK: NetworkData = {
+  name: 'Ignition',
+  url: 'https://mainnet.fuel.network/v1/graphql',
+  chainId: CHAIN_IDS.fuel.mainnet,
+  explorerUrl: 'https://app.fuel.network',
+  bridgeUrl: 'https://app.fuel.network/bridge',
+  isSelected: true,
+};
+
 export const DEFAULT_NETWORKS: Array<
   NetworkData & { faucetUrl?: string; bridgeUrl?: string; hidden?: boolean }
 > = [
-  {
-    name: 'Ignition',
-    url: 'https://mainnet.fuel.network/v1/graphql',
-    chainId: CHAIN_IDS.fuel.mainnet,
-    explorerUrl: 'https://app.fuel.network',
-    bridgeUrl: 'https://app.fuel.network/bridge',
-    isSelected: true,
-  },
+  IGNITION_NETWORK,
   {
     name: 'Fuel Sepolia Testnet',
     url: 'https://testnet.fuel.network/v1/graphql',