Skip to content

Commit

Permalink
Merge branch 'master' into fix-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
intls authored Jan 4, 2025
2 parents 4bfe683 + c307f90 commit 1ad9979
Show file tree
Hide file tree
Showing 7 changed files with 425 additions and 37 deletions.
2 changes: 1 addition & 1 deletion docs/fuel-token-overview
Submodule fuel-token-overview updated 0 files
2 changes: 1 addition & 1 deletion docs/nightly/fuel-token-overview
Submodule fuel-token-overview updated 0 files
2 changes: 1 addition & 1 deletion docs/nightly/fuels-wallet
Submodule fuels-wallet updated 44 files
+38 −0 .github/workflows/pr-tests-e2e-assets.yml
+1 −0 .github/workflows/pr-tests-e2e.yml
+1 −2 .vscode/extensions.json
+6 −1 .vscode/settings.json
+2 −1 package.json
+1 −2 packages/app/.env.example
+1 −1 packages/app/.env.production
+54 −0 packages/app/CHANGELOG.md
+1 −1 packages/app/env.d.ts
+2 −4 packages/app/package.json
+17 −0 packages/app/playwright.assets.config.ts
+1 −1 packages/app/playwright.config.ts
+131 −0 packages/app/playwright/crx/assets.test.ts
+2 −3 packages/app/src/config.ts
+10 −8 packages/app/src/networks.ts
+0 −8 packages/app/src/systems/Account/hooks/useAccounts.tsx
+113 −64 packages/app/src/systems/Account/machines/accountsMachine.tsx
+132 −44 packages/app/src/systems/Account/services/account.ts
+0 −2 packages/app/src/systems/Account/utils/storage.tsx
+22 −0 packages/app/src/systems/Contract/hooks/useContractMetadata.ts
+81 −0 packages/app/src/systems/Contract/machines/contractsMachine.ts
+24 −0 packages/app/src/systems/Contract/services/contracts.ts
+23 −6 packages/app/src/systems/Core/services/core.ts
+36 −29 packages/app/src/systems/Core/utils/database.ts
+28 −0 packages/app/src/systems/Core/utils/databaseNoDexie.ts
+47 −0 packages/app/src/systems/Core/utils/opfs.ts
+16 −0 packages/app/src/systems/Ecosystem/services/ecosystem.ts
+9 −0 packages/app/src/systems/Ecosystem/utils/getProjectImage.ts
+2 −0 packages/app/src/systems/Store/index.tsx
+3 −0 packages/app/src/systems/Store/types.ts
+20 −5 packages/app/src/systems/Transaction/components/TxRecipientCard/TxRecipientCard.tsx
+59 −0 packages/app/src/systems/Transaction/components/TxRecipientCard/TxRecipientContractLogo.tsx
+1 −2 packages/app/src/vite-env.d.ts
+8 −0 packages/connections/CHANGELOG.md
+1 −1 packages/connections/package.json
+1 −1 packages/docs/package.json
+12 −0 packages/playwright-utils/CHANGELOG.md
+3 −3 packages/playwright-utils/package.json
+12 −0 packages/types/CHANGELOG.md
+1 −1 packages/types/package.json
+6 −0 packages/types/src/contract.ts
+12 −0 packages/types/src/ecosystem.ts
+2 −0 packages/types/src/index.ts
+221 −237 pnpm-lock.yaml
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
"shiki": "0.14.4",
"strip-indent": "^4.0.0",
"swr": "^2.2.2",
"tailwindcss": "^3.4.17",
"toml": "^3.0.0",
"unified": "^10.1.2",
"unist-util-visit": "5.0.0",
Expand All @@ -98,7 +99,7 @@
},
"devDependencies": {
"@biomejs/biome": "1.6.1",
"@playwright/test": "^1.39.1",
"@playwright/test": "^1.49.1",
"@types/chrome": "^0.0.245",
"@types/cookie": "^0.5.2",
"@types/node": "^20.5.9",
Expand Down
432 changes: 401 additions & 31 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions src/config/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,22 @@ export const NAVIGATION: any[] = [
name: 'Specifications',
link: '/docs/specs',
},
{
name: 'Fuel Book',
link: '/docs/fuel-book',
},
{
name: 'Fuel Token Overview',
link: '/docs/fuel-token-overview',
},
{
name: 'Verified Addresses',
link: '/docs/verified-addresses',
},
{
name: 'Sway By Example',
link: '/docs/sway-by-example-lib',
},
{
name: 'Explorer',
link: EXPLORER_LINK,
Expand Down
5 changes: 3 additions & 2 deletions tests/utils/fixtures/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { BrowserContext } from '@playwright/test';
import { test as base, chromium } from '@playwright/test';

import { getExtensionsData } from './utils/getExtensionsData';
import { waitForExtensions } from './utils/waitForExtenssions';
// import { waitForExtensions } from './utils/waitForExtenssions';

import { readFileSync } from 'fs';
import { join } from 'path';
Expand Down Expand Up @@ -38,7 +38,8 @@ export const test = base.extend<{
// Ge extenssions data
const extensions = await getExtensionsData(context);
// Wait for Fuel Wallet to load
await waitForExtensions(context, extensions);
// TODO: reintroduce check
// await waitForExtensions(context, extensions);
// Set context to playwright
await use(context);
},
Expand Down

0 comments on commit 1ad9979

Please sign in to comment.