From 9b51dd2b9806f34fc79f9d26a7da29249f9d2a1c Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Thu, 12 May 2022 11:48:45 -0600 Subject: [PATCH 1/2] Update internal deps and add check for alpha flag on release branch, break if found --- .circleci/config.yml | 24 +++++++-- packages/coinbase/package.json | 4 +- packages/common/package.json | 2 +- packages/core/package.json | 4 +- .../src/views/account-center/Minimized.svelte | 52 ------------------- packages/fortmatic/package.json | 4 +- packages/gnosis/package.json | 4 +- packages/injected/package.json | 4 +- packages/keepkey/package.json | 4 +- packages/keystone/package.json | 4 +- packages/ledger/package.json | 4 +- packages/magic/package.json | 4 +- packages/mew/package.json | 4 +- packages/portis/package.json | 4 +- packages/react/package.json | 6 +-- packages/torus/package.json | 4 +- packages/trezor/package.json | 4 +- packages/walletconnect/package.json | 4 +- 18 files changed, 53 insertions(+), 87 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 57e976d52..0d39a348b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,9 +25,9 @@ aliases: branches: only: v2-web3-onboard-develop - - &test_package_version_for_alpha_tag + - &test_package_version_for_alpha_tag_break_false run: - name: Tagged as Alpha version + name: Tagged as Alpha version if True Continue Flow command: | PACKAGE_VERSION=$(cat package.json \ | grep version \ @@ -42,6 +42,23 @@ aliases: circleci step halt fi; + - &test_package_version_for_alpha_tag_break_true + run: + name: Tagged as Alpha version if True Stop Flow + command: | + PACKAGE_VERSION=$(cat package.json \ + | grep version \ + | head -1 \ + | awk -F: '{ print $2 }' \ + | sed 's/[",]//g'); + if [[ $PACKAGE_VERSION =~ "-alpha" ]]; + then + echo true + circleci step halt + else + echo false + fi; + - &restore-build-flag restore_cache: keys: @@ -107,6 +124,7 @@ commands: path: ~/web3-onboard-monorepo - *restore-build-flag - *test-build-flag + - *test_package_version_for_alpha_tag_break_true # Services and packages in a Workspace don't get their own # yarn.lock so we need to generate them manually. - *generate-lock-file @@ -130,7 +148,7 @@ commands: path: ~/web3-onboard-monorepo - *restore-build-flag - *test-build-flag - - *test_package_version_for_alpha_tag + - *test_package_version_for_alpha_tag_break_false # Services and packages in a Workspace don't get their own # yarn.lock so we need to generate them manually. - *generate-lock-file diff --git a/packages/coinbase/package.json b/packages/coinbase/package.json index 78d410af5..ed00c676b 100644 --- a/packages/coinbase/package.json +++ b/packages/coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/coinbase", - "version": "2.0.2-alpha", + "version": "2.0.2-alpha.1", "description": "Coinbase Wallet module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -20,7 +20,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@coinbase/wallet-sdk": "^3.0.5" } } diff --git a/packages/common/package.json b/packages/common/package.json index f9c07f2c8..7c72cc8d1 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/common", - "version": "2.0.9-alpha", + "version": "2.0.9-alpha.1", "scripts": { "build": "rollup -c", "dev": "rollup -c -w", diff --git a/packages/core/package.json b/packages/core/package.json index 15f971f76..a9134788e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/core", - "version": "2.2.8", + "version": "2.2.8-alpha.1", "scripts": { "build": "rollup -c", "dev": "rollup -c -w", @@ -41,7 +41,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "bowser": "^2.11.0", "ethers": "5.5.3", "eventemitter3": "^4.0.7", diff --git a/packages/core/src/views/account-center/Minimized.svelte b/packages/core/src/views/account-center/Minimized.svelte index cb98e9365..786cc83c5 100644 --- a/packages/core/src/views/account-center/Minimized.svelte +++ b/packages/core/src/views/account-center/Minimized.svelte @@ -151,60 +151,8 @@ icon={primaryWallet ? primaryWallet.icon : ''} /> - -
- -
- - - -
-
- {ensName ? shortenEns(ensName) : shortenedFirstAddress} -
- {#if firstAddressBalance} -
- {firstAddressBalance.length > 8 - ? firstAddressBalance.slice(0, 8) - : firstAddressBalance} - {firstAddressAsset} -
- {/if}
- - -
-
-
-
- {@html validAppChain - ? validAppChain.icon || - (defaultChainStyles && defaultChainStyles.icon) || - unrecognizedChainStyle.icon - : warningIcon} -
- - -
-
diff --git a/packages/fortmatic/package.json b/packages/fortmatic/package.json index 5184fd8a6..09a3b6b0c 100644 --- a/packages/fortmatic/package.json +++ b/packages/fortmatic/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/fortmatic", - "version": "2.0.2-alpha", + "version": "2.0.2-alpha.1", "description": "Fortmatic module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -20,7 +20,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "fortmatic": "^2.2.1" } } diff --git a/packages/gnosis/package.json b/packages/gnosis/package.json index 35481827a..fa92976a7 100644 --- a/packages/gnosis/package.json +++ b/packages/gnosis/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/gnosis", - "version": "2.0.1-alpha", + "version": "2.0.1-alpha.1", "description": "Gnosis module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -21,7 +21,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@gnosis.pm/safe-apps-provider": "^0.9.2", "@gnosis.pm/safe-apps-sdk": "^6.1.1" } diff --git a/packages/injected/package.json b/packages/injected/package.json index aa2d70c69..b0497710f 100644 --- a/packages/injected/package.json +++ b/packages/injected/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/injected-wallets", - "version": "2.0.6-alpha", + "version": "2.0.6-alpha.1", "description": "Injected wallets module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -25,7 +25,7 @@ "window": "^4.2.7" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "joi": "^17.4.2", "lodash.uniqby": "^4.7.0" } diff --git a/packages/keepkey/package.json b/packages/keepkey/package.json index 4c4003939..d6f425598 100644 --- a/packages/keepkey/package.json +++ b/packages/keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/keepkey", - "version": "2.0.3-alpha", + "version": "2.0.3-alpha.1", "description": "KeepKey module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -24,7 +24,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@ethersproject/providers": "^5.5.0", "@shapeshiftoss/hdwallet-core": "^1.15.2", "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.15.2", diff --git a/packages/keystone/package.json b/packages/keystone/package.json index 032c99373..67466f43c 100644 --- a/packages/keystone/package.json +++ b/packages/keystone/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/keystone", - "version": "2.0.3-alpha", + "version": "2.0.3-alpha.1", "description": "Keystone module for web3-onboard", "module": "dist/index.js", "typings": "dist/index.d.ts", @@ -18,7 +18,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@ethereumjs/tx": "^3.4.0", "@ethersproject/providers": "^5.5.0", "@keystonehq/eth-keyring": "^0.11.2-alpha.2" diff --git a/packages/ledger/package.json b/packages/ledger/package.json index 77f7f86c8..daa3b9433 100644 --- a/packages/ledger/package.json +++ b/packages/ledger/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/ledger", - "version": "2.0.4-alpha", + "version": "2.0.4-alpha.1", "description": "Ledger module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -21,7 +21,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@ethereumjs/tx": "^3.4.0", "@ethersproject/providers": "^5.5.0", "@ledgerhq/hw-app-eth": "^6.19.0", diff --git a/packages/magic/package.json b/packages/magic/package.json index ffe054b00..484a0dcca 100644 --- a/packages/magic/package.json +++ b/packages/magic/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/magic", - "version": "2.0.3-alpha", + "version": "2.0.3-alpha.1", "description": "Magic module for Onboard.js", "scripts": { "build": "rollup -c", @@ -42,7 +42,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "magic-sdk": "^8.1.0", "rxjs": "^7.5.2", "joi": "^17.4.2" diff --git a/packages/mew/package.json b/packages/mew/package.json index 020a8eaa9..936929e1f 100644 --- a/packages/mew/package.json +++ b/packages/mew/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/mew", - "version": "2.0.0-alpha", + "version": "2.0.0-alpha.1", "description": "MEW module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -23,7 +23,7 @@ "@myetherwallet/mewconnect-web-client": "^2.2.0-beta.14" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "rxjs": "^7.5.2" } } diff --git a/packages/portis/package.json b/packages/portis/package.json index 42b3389fd..88d5fe08a 100644 --- a/packages/portis/package.json +++ b/packages/portis/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/portis", - "version": "2.0.0-alpha", + "version": "2.0.0-alpha.1", "description": "Portis module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -20,7 +20,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@portis/web3": "^4.0.6" } } diff --git a/packages/react/package.json b/packages/react/package.json index 64b6b5028..5264517ff 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/react", - "version": "2.1.6-alpha", + "version": "2.1.6-alpha.1", "description": "Collection of React Hooks for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -21,8 +21,8 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", - "@web3-onboard/core": "^2.2.7" + "@web3-onboard/common": "^2.0.7-alpha.1", + "@web3-onboard/core": "^2.2.7-alpha.1" }, "peerDependencies": { "react": "^17.0.2" diff --git a/packages/torus/package.json b/packages/torus/package.json index f43f9c73b..9ee66f301 100644 --- a/packages/torus/package.json +++ b/packages/torus/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/torus", - "version": "2.0.1-alpha", + "version": "2.0.1-alpha.1", "description": "Torus module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -20,7 +20,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@toruslabs/torus-embed": "^1.18.3" } } diff --git a/packages/trezor/package.json b/packages/trezor/package.json index 83904a261..a369ebb04 100644 --- a/packages/trezor/package.json +++ b/packages/trezor/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/trezor", - "version": "2.0.5-alpha", + "version": "2.0.5-alpha.1", "description": "Trezor module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -20,7 +20,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@ethereumjs/tx": "^3.4.0", "@ethersproject/providers": "^5.5.0", "buffer": "^6.0.3", diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json index 16af4847e..984bb69fa 100644 --- a/packages/walletconnect/package.json +++ b/packages/walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/walletconnect", - "version": "2.0.1-alpha", + "version": "2.0.1-alpha.1", "description": "WalletConnect module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@ethersproject/providers": "^5.5.0", - "@web3-onboard/common": "^2.0.7", + "@web3-onboard/common": "^2.0.7-alpha.1", "@walletconnect/client": "^1.7.1", "@walletconnect/qrcode-modal": "^1.7.1", "rxjs": "^7.5.2" From 419a4b7032ce03dbf3fb67f0c6f87e807262565d Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Thu, 12 May 2022 11:50:49 -0600 Subject: [PATCH 2/2] Revert unnecessary change --- .../src/views/account-center/Minimized.svelte | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/packages/core/src/views/account-center/Minimized.svelte b/packages/core/src/views/account-center/Minimized.svelte index 786cc83c5..cb98e9365 100644 --- a/packages/core/src/views/account-center/Minimized.svelte +++ b/packages/core/src/views/account-center/Minimized.svelte @@ -151,8 +151,60 @@ icon={primaryWallet ? primaryWallet.icon : ''} /> + +
+ +
+ + + +
+
+ {ensName ? shortenEns(ensName) : shortenedFirstAddress} +
+ {#if firstAddressBalance} +
+ {firstAddressBalance.length > 8 + ? firstAddressBalance.slice(0, 8) + : firstAddressBalance} + {firstAddressAsset} +
+ {/if}
+ + +
+
+
+
+ {@html validAppChain + ? validAppChain.icon || + (defaultChainStyles && defaultChainStyles.icon) || + unrecognizedChainStyle.icon + : warningIcon} +
+ + +
+