Skip to content

Commit

Permalink
feat: update fuel-ui and other libs (#821)
Browse files Browse the repository at this point in the history
  • Loading branch information
@LuizAsFight
LuizAsFight authored Aug 1, 2023
1 parent a2451ab commit 4e08bc0
Show file tree
Hide file tree
Showing 33 changed files with 3,933 additions and 5,596 deletions.
7 changes: 7 additions & 0 deletions .changeset/quiet-timers-film.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@fuel-wallet/types': patch
'fuels-wallet': patch
'@fuel-wallet/sdk': patch
---

Upgrade to fuel-core 0.19.1
1 change: 1 addition & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ pnpm-lock.yaml
.next
**/storybook/**/*
**/__generated__/
**/generated/
.changeset/**.md
2 changes: 1 addition & 1 deletion docker/fuel-core/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/fuellabs/fuel-core:v0.19.0
FROM ghcr.io/fuellabs/fuel-core:v0.19.1

ENV MIN_GAS_PRICE="${MIN_GAS_PRICE}"
ENV CONSENSUS_KEY="${CONSENSUS_KEY}"
Expand Down
46 changes: 23 additions & 23 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,40 +68,40 @@
"xstate:typegen": "pnpm -r xstate:typegen"
},
"dependencies": {
"@fuel-ui/config": "0.16.1",
"@fuel-ui/css": "0.16.1",
"@fuel-ui/react": "0.16.1",
"@fuel-ui/test-utils": "0.16.1",
"execa": "^7.1.1"
"@fuel-ui/config": "0.17.0",
"@fuel-ui/css": "0.17.0",
"@fuel-ui/react": "0.17.0",
"@fuel-ui/test-utils": "0.17.0",
"execa": "^7.2.0"
},
"devDependencies": {
"@babel/core": "^7.22.1",
"@babel/core": "^7.22.9",
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.1",
"@jest/types": "29.5.0",
"@playwright/test": "^1.34.3",
"@types/jest": "^29.5.2",
"@types/node": "18.15.3",
"@types/react": "^18.2.7",
"@types/react-dom": "^18.2.4",
"@xstate/cli": "^0.5.1",
"dotenv": "^16.1.2",
"eslint": "^8.41.0",
"@changesets/cli": "^2.26.2",
"@jest/types": "29.6.1",
"@playwright/test": "^1.36.2",
"@types/jest": "^29.5.3",
"@types/node": "20.4.5",
"@types/react": "^18.2.17",
"@types/react-dom": "^18.2.7",
"@xstate/cli": "^0.5.2",
"dotenv": "^16.3.1",
"eslint": "^8.46.0",
"fs-extra": "^11.1.1",
"http-server": "^14.1.1",
"husky": "^8.0.3",
"identity-obj-proxy": "^3.0.0",
"jest": "29.5.0",
"jest-environment-jsdom": "29.5.0",
"jest": "29.6.2",
"jest-environment-jsdom": "29.6.2",
"jest-transform-stub": "^2.0.0",
"lint-staged": "^13.2.2",
"lint-staged": "^13.2.3",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"ts-jest": "^29.1.0",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"turbo": "^1.10.0",
"typescript": "^5.0.4",
"updates": "^14.1.1"
"turbo": "^1.10.12",
"typescript": "^5.1.6",
"updates": "^14.3.4"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
2 changes: 1 addition & 1 deletion packages/app/.env.production
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VITE_CRX_NAME="Fuel Wallet"
VITE_FUEL_PROVIDER_URL=https://beta-3.fuel.network/graphql
VITE_FUEL_PROVIDER_URL=https://beta3-5-devv.swayswap.io/graphql
VITE_FUEL_FAUCET_URL=https://faucet-beta-3.fuel.network/
VITE_MNEMONIC_WORDS=12
VITE_FAUCET_RECAPTCHA_KEY=6Ld3cEwfAAAAAMd4QTs7aO85LyKGdgj0bFsdBfre
Expand Down
5 changes: 3 additions & 2 deletions packages/app/codegen.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@ const config: CodegenConfig = {
Signature: 'string',
Tai64Timestamp: 'string',
TxPointer: 'string',
Nonce: 'string',
U32: 'string',
},
},
},
},
hooks: {
afterOneFileWrite: [
'pnpm eslint --fix',
'pnpm eslint --fix --no-ignore',
'pnpm prettier --write',
'pnpm fix-codegen',
],
},
};
Expand Down
116 changes: 58 additions & 58 deletions packages/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.11.1",
"database": "11",
"scripts": {
"build:all": "run-p build:web build:crx build:storybook",
"build:all": "run-s build:web build:crx build:storybook",
"build:web": "./scripts/build.sh --app=vite",
"build:crx": "./scripts/build.sh --app=crx",
"build:storybook": "./scripts/build.sh --app=storybook",
Expand All @@ -17,106 +17,106 @@
"test:watch": "jest --watch",
"ts:check": "pnpm xstate:typegen && tsc --noEmit",
"xstate:typegen": "xstate typegen 'src/**/*.ts?(x)'",
"codegen": "graphql-codegen --config codegen.ts",
"fix-codegen": "./scripts/fix-codegen.sh"
"codegen": "graphql-codegen --config codegen.ts"
},
"dependencies": {
"@fontsource/source-code-pro": "^5.0.2",
"@fuel-ts/wallet-manager": "0.48.1",
"@fuel-ui/config": "0.16.1",
"@fuel-ui/css": "0.16.1",
"@fuel-ui/react": "0.16.1",
"@fuel-ui/test-utils": "0.16.1",
"@fontsource/source-code-pro": "^5.0.5",
"@fuel-ts/wallet-manager": "0.49.1",
"@fuel-ui/config": "0.17.0",
"@fuel-ui/css": "0.17.0",
"@fuel-ui/react": "0.17.0",
"@fuel-ui/test-utils": "0.17.0",
"@fuel-wallet/sdk": "workspace:*",
"@fuel-wallet/storage": "workspace:../storage",
"@fuel-wallet/types": "workspace:*",
"@fuel-wallet/xstore": "workspace:../store",
"@hookform/resolvers": "^3.1.0",
"@react-aria/utils": "^3.17.0",
"@sentry/browser": "^7.56.0",
"@storybook/addon-viewport": "^7.0.18",
"@hookform/resolvers": "^3.1.1",
"@react-aria/utils": "^3.18.0",
"@sentry/browser": "^7.60.1",
"@storybook/addon-viewport": "^7.1.1",
"@storybook/jest": "^0.1.0",
"@xstate/react": "^3.2.2",
"asset-list": "workspace:../asset-list",
"cross-fetch": "^4.0.0",
"dayjs": "^1.11.7",
"dayjs": "^1.11.9",
"dexie": "^3.2.4",
"dexie-observable": "4.0.1-beta.13",
"dexie-react-hooks": "^1.1.4",
"dexie-react-hooks": "^1.1.6",
"events": "^3.3.0",
"fake-indexeddb": "^4.0.1",
"framer-motion": "^10.12.16",
"fuels": "0.48.1",
"fake-indexeddb": "^4.0.2",
"framer-motion": "^10.15.0",
"fuels": "0.49.1",
"graphql": "^16.6.0",
"graphql-request": "^5.2.0",
"graphql-request": "^6.1.0",
"graphql-tag": "^2.12.6",
"json-rpc-2.0": "^1.6.0",
"lodash.debounce": "^4.0.8",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-google-recaptcha": "^2.1.0",
"react-google-recaptcha": "^3.1.0",
"react-helmet": "^6.1.0",
"react-hook-form": "^7.44.2",
"react-hook-form": "^7.45.2",
"react-json-view": "^1.21.3",
"react-qr-code": "^2.0.11",
"react-router-dom": "^6.11.2",
"react-router-dom": "^6.14.2",
"tai64": "^1.0.0",
"vite-plugin-markdown": "^2.1.0",
"xstate": "^4.37.2",
"xstate": "^4.38.2",
"yup": "^1.2.0"
},
"devDependencies": {
"@crxjs/vite-plugin": "^1.0.14",
"@graphql-codegen/cli": "^3.2.2",
"@graphql-codegen/cli": "^5.0.0",
"@graphql-codegen/named-operations-object": "^2.3.1",
"@graphql-codegen/near-operation-file-preset": "^2.5.0",
"@graphql-codegen/typescript": "^3.0.2",
"@graphql-codegen/typescript-graphql-request": "^4.5.8",
"@graphql-codegen/typescript-operations": "^3.0.2",
"@graphql-codegen/typescript": "^4.0.1",
"@graphql-codegen/typescript-graphql-request": "^5.0.0",
"@graphql-codegen/typescript-operations": "^4.0.1",
"@graphql-codegen/typescript-react-apollo": "^3.3.7",
"@playwright/test": "^1.34.3",
"@storybook/addon-a11y": "^7.0.18",
"@storybook/addon-actions": "^7.0.18",
"@storybook/addon-essentials": "^7.0.18",
"@storybook/addon-interactions": "^7.0.18",
"@storybook/addon-jest": "^7.0.18",
"@storybook/addon-links": "^7.0.18",
"@storybook/addon-storysource": "^7.0.18",
"@storybook/addons": "^7.0.18",
"@storybook/api": "^7.0.18",
"@storybook/components": "^7.0.18",
"@storybook/core-events": "^7.0.18",
"@playwright/test": "^1.36.2",
"@storybook/addon-a11y": "^7.1.1",
"@storybook/addon-actions": "^7.1.1",
"@storybook/addon-essentials": "^7.1.1",
"@storybook/addon-interactions": "^7.1.1",
"@storybook/addon-jest": "^7.1.1",
"@storybook/addon-links": "^7.1.1",
"@storybook/addon-storysource": "^7.1.1",
"@storybook/addons": "^7.1.1",
"@storybook/api": "^7.1.1",
"@storybook/components": "^7.1.1",
"@storybook/core-events": "^7.1.1",
"@storybook/jest": "^0.1.0",
"@storybook/react": "^7.0.18",
"@storybook/react-vite": "^7.0.18",
"@storybook/react-webpack5": "^7.0.18",
"@storybook/testing-library": "^0.1.0",
"@storybook/theming": "^7.0.18",
"@types/chrome": "^0.0.237",
"@storybook/react": "^7.1.1",
"@storybook/react-vite": "^7.1.1",
"@storybook/react-webpack5": "^7.1.1",
"@storybook/testing-library": "^0.2.0",
"@storybook/theming": "^7.1.1",
"@types/chrome": "^0.0.242",
"@types/lodash.clonedeep": "^4.5.7",
"@types/lodash.debounce": "^4.0.7",
"@types/react": "^18.2.7",
"@types/prettier": "^2.7.3",
"@types/react": "^18.2.17",
"@types/react-custom-scroll": "^4.3.2",
"@types/react-dom": "^18.2.4",
"@types/react-dom": "^18.2.7",
"@types/react-google-recaptcha": "^2.1.5",
"@types/react-helmet": "^6.1.6",
"@types/testing-library__jest-dom": "^5.14.6",
"@vitejs/plugin-react": "^4.0.0",
"@types/testing-library__jest-dom": "^5.14.9",
"@vitejs/plugin-react": "^4.0.3",
"@xstate/inspect": "^0.8.0",
"get-graphql-schema": "^2.1.2",
"msw": "^1.2.1",
"msw": "^1.2.3",
"msw-storybook-addon": "^1.8.0",
"storybook": "^7.0.18",
"storybook-addon-react-router-v6": "^1.0.1",
"storybook-dark-mode": "^3.0.0",
"storybook": "^7.1.1",
"storybook-addon-react-router-v6": "^1.0.2",
"storybook-dark-mode": "^3.0.1",
"ts-jest-mock-import-meta": "^1.0.0",
"tsconfig-paths-webpack-plugin": "^4.0.0",
"typescript": "^5.0.4",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "^5.1.6",
"util": "^0.12.5",
"vite": "^4.3.9",
"vite": "^4.4.7",
"vite-plugin-clean": "^1.0.0",
"vite-plugin-static-copy": "^0.15.0",
"vite-plugin-zip-pack": "^1.0.5",
"vite-plugin-static-copy": "^0.17.0",
"vite-plugin-zip-pack": "^1.0.6",
"vite-tsconfig-paths": "^4.2.0"
},
"msw": {
Expand Down
38 changes: 19 additions & 19 deletions packages/app/playwright/e2e/Networks.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
getInputByName,
getButtonByText,
hasText,
reload,
} from '../commons';
import { mockData } from '../mocks';

Expand Down Expand Up @@ -78,23 +79,22 @@ test.describe('Networks', () => {
await expect(items.first()).toHaveAttribute('data-active', 'true');
});

// TODO: commented out until we have a valid network to add (beta-3 no longer valid)
// test('should be able to add a new network', async () => {
// await visit(page, '/wallet');
// await getByAriaLabel(page, 'Selected Network').click();
// await hasText(page, /Add new network/i);
// await getByAriaLabel(page, 'Add network').click();
// const buttonCreate = getButtonByText(page, /add/i);
// await expect(buttonCreate).toBeDisabled();
// const urlInput = getInputByName(page, 'url');
// await expect(urlInput).toBeFocused();
// await urlInput.fill('https://beta-3.fuel.network/graphql');
// await hasText(page, /Testnet Beta 3/i, 0, 15000);
// await expect(buttonCreate).toBeEnabled();
// await buttonCreate.click();
// // Wait for save and close popup;
// await page.waitForTimeout(2000);
// await reload(page);
// await hasText(page, /Testnet Beta 3/i);
// });
test('should be able to add a new network', async () => {
await visit(page, '/wallet');
await getByAriaLabel(page, 'Selected Network').click();
await hasText(page, /Add new network/i);
await getByAriaLabel(page, 'Add network').click();
const buttonCreate = getButtonByText(page, /add/i);
await expect(buttonCreate).toBeDisabled();
const urlInput = getInputByName(page, 'url');
await expect(urlInput).toBeFocused();
await urlInput.fill('https://beta3-5-devv.swayswap.io/graphql');
await hasText(page, /Testnet/i, 0, 15000);
await expect(buttonCreate).toBeEnabled();
await buttonCreate.click();
// Wait for save and close popup;
await page.waitForTimeout(2000);
await reload(page);
await hasText(page, /Testnet/i);
});
});
2 changes: 1 addition & 1 deletion packages/app/playwright/mocks/database.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const ALT_ASSET = {

export const FUEL_NETWORK = {
name: 'Fuel Testnet',
url: 'https://beta-3.fuel.network/graphql',
url: 'https://beta3-5-devv.swayswap.io/graphql',
};

export async function getAccount(page: Page) {
Expand Down
9 changes: 0 additions & 9 deletions packages/app/scripts/fix-codegen.sh
View file

This file was deleted.

Loading

0 comments on commit 4e08bc0

Please sign in to comment.