Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flow emulator progress #323

Closed
wants to merge 70 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
377c0ae
Fixed: moving strucutre
zzggo Dec 10, 2024
d1609a7
fixed: turnback on mix panel
zzggo Dec 10, 2024
b36d7d0
fixed: static component
zzggo Dec 10, 2024
a0986ce
fixed: import component
zzggo Dec 10, 2024
85f065d
fixed: import pathing
zzggo Dec 10, 2024
7eed1aa
fixed: add todo
zzggo Dec 10, 2024
3eab2a0
Merge remote-tracking branch 'origin/dev' into move-and-register-page…
zzggo Dec 10, 2024
78d559f
fixed: import pager ui and function seperation
zzggo Dec 10, 2024
d4cf6f9
fixed: update move component
zzggo Dec 10, 2024
c15758c
Merge remote-tracking branch 'origin/dev' into move-and-register-page…
zzggo Dec 11, 2024
a7e1824
fixed: updatte welcome page
zzggo Dec 11, 2024
eb9dc0d
feat: updatte page name
zzggo Dec 11, 2024
b0da21a
fixed: update file directory
zzggo Dec 11, 2024
3d86d25
Fixed: update register page landing
zzggo Dec 11, 2024
6011abc
fixed: update add account page
zzggo Dec 11, 2024
e4d8bca
Merge remote-tracking branch 'origin/dev' into move-and-register-page…
zzggo Dec 12, 2024
f8ffb93
Merge remote-tracking branch 'origin/dev' into move-and-register-page…
zzggo Dec 12, 2024
7e90299
fixed: update welcome page structure and components
zzggo Dec 15, 2024
b4ef725
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 15, 2024
e7d7924
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 16, 2024
6e29bca
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 16, 2024
debf06d
feat: update keyring, remove rabby dependencies
zzggo Dec 17, 2024
29e559c
fixed: remove unused import
zzggo Dec 17, 2024
ac1a718
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 17, 2024
d2d7fe9
Fixed: moving strucutre
zzggo Dec 10, 2024
7f7c89d
fixed: static component
zzggo Dec 10, 2024
2e59322
fixed: import component
zzggo Dec 10, 2024
95b852a
fixed: import pathing
zzggo Dec 10, 2024
78ee014
fixed: add todo
zzggo Dec 10, 2024
84ce319
fixed: import pager ui and function seperation
zzggo Dec 10, 2024
ecc04b9
fixed: update move component
zzggo Dec 10, 2024
84f5e0a
fixed: updatte welcome page
zzggo Dec 11, 2024
751728b
feat: updatte page name
zzggo Dec 11, 2024
e42cd6d
fixed: update file directory
zzggo Dec 11, 2024
ad97ec7
Fixed: update register page landing
zzggo Dec 11, 2024
902a926
fixed: update add account page
zzggo Dec 11, 2024
b28ef8a
fixed: update welcome page structure and components
zzggo Dec 15, 2024
ddfa4d2
Merge branch 'move-and-register-page-refactor' of github.com:Outblock…
zzggo Dec 17, 2024
69d0e0f
feat: remove metmask store from keyring
zzggo Dec 17, 2024
72a998c
fixed: remove metamask hash utils when using sign type data.
zzggo Dec 17, 2024
7c45a8a
fixed: remove console
zzggo Dec 17, 2024
43517e3
fixed: merge setpassword, update the page components.
zzggo Dec 18, 2024
ab8d1d3
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 18, 2024
c695de8
Merge branch 'dev' into 295-feature-remove-metamask-and-rabby-wallet-…
zzggo Dec 18, 2024
ae9c240
fixed: update folder structure and files
zzggo Dec 18, 2024
c63c5ee
fixed: import order
zzggo Dec 18, 2024
3fb3a9d
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 19, 2024
84e52f9
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 19, 2024
066f461
fixed: move savestorage util func to background
zzggo Dec 19, 2024
0aab826
Updated to compile as an ES module
tombeckenham Dec 19, 2024
7bb0f6c
fixed: update qrcode style
zzggo Dec 19, 2024
c1214f7
fixed: update directory name
zzggo Dec 19, 2024
bb4bcc9
fixed: add googlebackup component
zzggo Dec 19, 2024
bb3c85d
fixed: remove duplicate component, fixed text
zzggo Dec 19, 2024
69ce3f8
Changed postcss config to mjs
tombeckenham Dec 19, 2024
d5bdced
Merge branch 'dev' into 295-feature-remove-metamask-and-rabby-wallet-…
zzggo Dec 20, 2024
7e604e5
fixed: update package json to remove dependencies
zzggo Dec 20, 2024
31313aa
fixed: update routtes
zzggo Dec 20, 2024
4c241bd
fixed: update the folder
zzggo Dec 20, 2024
c7cf48a
fixed: move components
zzggo Dec 20, 2024
dd9ecca
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 20, 2024
9adaf8a
Merge branch 'dev' into 295-feature-remove-metamask-and-rabby-wallet-…
zzggo Dec 20, 2024
f1e2285
Merge pull request #314 from Outblock:305-feature-build-using-esm-mod…
tombeckenham Dec 20, 2024
d7847bc
Merge pull request #301 from Outblock/295-feature-remove-metamask-and…
zzggo Dec 20, 2024
103f8c9
Merge branch 'dev' into move-and-register-page-refactor
zzggo Dec 20, 2024
873e7b1
fixed: component name
zzggo Dec 20, 2024
f87b6e2
fixed: import component name
zzggo Dec 20, 2024
dff5dda
fixed: change google component loading
zzggo Dec 20, 2024
6be4f8d
Merge pull request #277 from Outblock/move-and-register-page-refactor
zzggo Dec 20, 2024
a1a3940
Flow emulator progress
tombeckenham Dec 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ dist.7z
/playwright/.cache/
dependency-usage.md
extension-dependencies.md
emulator-account.pkey
flow.json
3 changes: 3 additions & 0 deletions _raw/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@
"Testnet": {
"message": "Testnet"
},
"Emulator": {
"message": "Emulator"
},
"Crescendo": {
"message": "Crescendo"
},
Expand Down
3 changes: 3 additions & 0 deletions _raw/_locales/ja/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@
"Testnet": {
"message": "Testnet"
},
"Emulator": {
"message": "Emulator"
},
"Crescendo": {
"message": "Crescendo"
},
Expand Down
3 changes: 3 additions & 0 deletions _raw/_locales/ru/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@
"Testnet": {
"message": "Testnet"
},
"Emulator": {
"message": "Emulator"
},
"Crescendo": {
"message": "Crescendo"
},
Expand Down
3 changes: 3 additions & 0 deletions _raw/_locales/zh_CN/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@
"Testnet": {
"message": "测试网"
},
"Emulator": {
"message": "沙盒网"
},
"Crescendo": {
"message": "沙盒网"
},
Expand Down
4 changes: 4 additions & 0 deletions build/analyze-dependencies.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import fs from 'fs';
import path from 'path';
import { fileURLToPath } from 'url';

import { parse } from '@babel/parser';
import traverseDefault from '@babel/traverse';
Expand All @@ -8,6 +9,9 @@ import webpack from 'webpack';

import webpackConfig from '../webpack.config.js';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

type Dependencies = {
background: Set<string>;
ui: Set<string>;
Expand Down
4 changes: 4 additions & 0 deletions build/prepareManifest.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import fs from 'fs';
import http from 'http';
import path from 'path';
import { fileURLToPath } from 'url';

import dotenv from 'dotenv';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const PROJECT_ROOT = path.resolve(__dirname, '..');
const args = process.argv.slice(2);
const mode = args[0];
Expand Down
4 changes: 4 additions & 0 deletions build/release.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import fs from 'fs';
import path from 'path';
import { fileURLToPath } from 'url';

import { prompt } from 'enquirer';
import shell from 'shelljs';
import zipdir from 'zip-dir';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const PROJECT_ROOT = path.resolve(__dirname, '..');
type Version = `${number}.${number}.${number}`;

Expand Down
8 changes: 5 additions & 3 deletions build/webpack.common.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import path from 'path';

import CopyPlugin from 'copy-webpack-plugin';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
import webpack from 'webpack';

import packageJson from '../package.json';
Expand Down Expand Up @@ -176,10 +175,13 @@ const config = (env: { config: 'dev' | 'pro' | 'none' }): webpack.Configuration
resolve: {
alias: {
moment: require.resolve('dayjs'),
// Forces all cross-fetch imports to use the same instance
'cross-fetch': require.resolve('cross-fetch'),
'@': paths.rootResolve('src'),
ui: paths.rootResolve('src/ui'),
background: paths.rootResolve('src/background'),
consts: paths.rootResolve('src/constant/index'),
},
plugins: [new TsconfigPathsPlugin()],
plugins: [],
fallback: {
// Removes polyfills that were interfering with native fetch
http: false,
Expand Down
6 changes: 5 additions & 1 deletion e2e/wallet.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import path from 'path';
import { fileURLToPath } from 'url';

import { test, expect, chromium } from '@playwright/test';
import { test, chromium } from '@playwright/test';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

test('Load extension', async () => {
// Get path to extension
Expand Down
16 changes: 5 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "flow-reference-wallet",
"version": "2.6.3",
"description": "Digital wallet created for everyone.",
"type": "module",
"scripts": {
"prepare:dev": "pnpx tsx ./build/prepareManifest.ts dev",
"prepare:pro": "pnpx tsx ./build/prepareManifest.ts pro",
Expand Down Expand Up @@ -36,8 +37,6 @@
"@emotion/styled": "^11.13.5",
"@ledgerhq/hw-app-eth": "^6.41.1",
"@ledgerhq/hw-transport-webusb": "^6.29.4",
"@metamask/eth-sig-util": "^4.0.1",
"@metamask/obs-store": "^6.0.2",
"@mui/base": "5.0.0-beta.62",
"@mui/icons-material": "^5.16.7",
"@mui/lab": "5.0.0-alpha.173",
Expand All @@ -49,11 +48,6 @@
"@onflow/fcl-wc": "^5.5.3",
"@onflow/transport-http": "1.10.2",
"@onflow/types": "^1.4.1",
"@rabby-wallet/eth-hd-keyring": "^3.6.12",
"@rabby-wallet/eth-lattice-keyring": "^0.4.4",
"@rabby-wallet/eth-simple-keyring": "^4.2.1",
"@rabby-wallet/eth-watch-keyring": "^1.0.0",
"@rabby-wallet/page-provider": "^0.3.5",
"@reown/walletkit": "^1.1.1",
"@sentry/browser": "^6.19.7",
"@sentry/react": "^6.19.7",
Expand Down Expand Up @@ -160,7 +154,7 @@
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"@welldone-software/why-did-you-render": "^6.2.3",
"autoprefixer": "latest",
"autoprefixer": "^10.4.20",
"css-loader": "^5.2.7",
"dotenv": "^16.4.5",
"dotenv-webpack": "^8.1.0",
Expand All @@ -187,10 +181,10 @@
"path-browserify": "^1.0.1",
"pinst": "^3.0.0",
"postcss": "^8.4.49",
"postcss-custom-properties": "^11.0.0",
"postcss-import": "^14.1.0",
"postcss-custom-properties": "^14.0.4",
"postcss-import": "^16.1.0",
"postcss-loader": "^5.3.0",
"postcss-nested": "^5.0.6",
"postcss-nested": "^7.0.2",
"prettier": "^3.3.3",
"react-devtools": "^6.0.1",
"react-i18next": "^15.1.1",
Expand Down
2 changes: 1 addition & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { defineConfig, devices } from '@playwright/test';
* See https://playwright.dev/docs/test-configuration.
*/
export default defineConfig({
testDir: './tests',
testDir: './e2e',
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
Expand Down
Loading
Loading