Skip to content

Commit

Permalink
Merge remote-tracking branch 'shapeshift/develop' into l10n
Browse files Browse the repository at this point in the history
  • Loading branch information
firebomb1 committed Sep 19, 2024
2 parents 31dab38 + 1d4512b commit c9ff576
Show file tree
Hide file tree
Showing 91 changed files with 8,781 additions and 4,773 deletions.
1 change: 0 additions & 1 deletion .env.base
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ REACT_APP_FEATURE_ARBITRUM_NOVA=false
REACT_APP_FEATURE_BASE=true
REACT_APP_FEATURE_OPTIMISM=true
REACT_APP_FEATURE_JAYPEGZ=true
REACT_APP_FEATURE_DEFI_DASHBOARD=true
REACT_APP_FEATURE_MIXPANEL=true
REACT_APP_FEATURE_SAVERS_VAULTS=true
REACT_APP_FEATURE_SAVERS_VAULTS_DEPOSIT=true
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/cloudflare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ jobs:
restore-keys: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- name: Yarn Install
run: yarn install --immutable
- name: Build Packages
run: yarn build:packages
- name: Build Web
run: yarn env && yarn build:web
# a poor mans extension of cloudflare/pages-action@1 https://github.com/cloudflare/pages-action/blob/main/src/index.ts
Expand Down
38 changes: 21 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,19 @@
"@shapeshiftoss/caip": "workspace:^",
"@shapeshiftoss/chain-adapters": "workspace:^",
"@shapeshiftoss/errors": "workspace:^",
"@shapeshiftoss/hdwallet-coinbase": "1.55.2",
"@shapeshiftoss/hdwallet-core": "1.55.2",
"@shapeshiftoss/hdwallet-keepkey": "1.55.2",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.2",
"@shapeshiftoss/hdwallet-keplr": "1.55.2",
"@shapeshiftoss/hdwallet-ledger": "1.55.2",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.55.2",
"@shapeshiftoss/hdwallet-metamask": "1.55.2",
"@shapeshiftoss/hdwallet-native": "1.55.2",
"@shapeshiftoss/hdwallet-native-vault": "1.55.2",
"@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.2",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.55.2",
"@shapeshiftoss/hdwallet-xdefi": "1.55.2",
"@shapeshiftoss/hdwallet-coinbase": "1.55.4",
"@shapeshiftoss/hdwallet-core": "1.55.4",
"@shapeshiftoss/hdwallet-keepkey": "1.55.4",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.4",
"@shapeshiftoss/hdwallet-keplr": "1.55.4",
"@shapeshiftoss/hdwallet-ledger": "1.55.4",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.55.4",
"@shapeshiftoss/hdwallet-metamask": "1.55.4",
"@shapeshiftoss/hdwallet-native": "1.55.4",
"@shapeshiftoss/hdwallet-native-vault": "1.55.4",
"@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.4",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.55.4",
"@shapeshiftoss/hdwallet-xdefi": "1.55.4",
"@shapeshiftoss/swapper": "workspace:^",
"@shapeshiftoss/types": "workspace:^",
"@shapeshiftoss/unchained-client": "workspace:^",
Expand Down Expand Up @@ -136,7 +136,7 @@
"chakra-ui-steps": "^1.7.3",
"crypto-browserify": "^3.12.0",
"dayjs": "^1.11.3",
"dompurify": "^2.3.8",
"dompurify": "^2.5.4",
"embla-carousel-auto-height": "^7.0.9",
"embla-carousel-autoplay": "^7.0.5",
"embla-carousel-react": "^7.0.5",
Expand Down Expand Up @@ -279,7 +279,8 @@
"path-browserify": "^1.0.1",
"pify": "^5.0.0",
"prettier": "^3.0.3",
"react-app-rewired": "^2.1.9",
"react-app-rewired": "^2.2.1",
"react-dev-utils": "^12.0.1",
"react-scripts": "^5.0.1",
"readline-sync": "^1.4.10",
"reselect-tools": "^0.0.7",
Expand All @@ -294,8 +295,9 @@
"vite-tsconfig-paths": "^4.2.3",
"vitest": "1.1.1",
"web3-types": "^0.1.0-alpha.0",
"webpack": "5.76.0",
"webpack-subresource-integrity": "^5.0.0"
"webpack": "5.94.0",
"webpack-subresource-integrity": "^5.0.0",
"workbox-webpack-plugin": "^7.1.0"
},
"peerDependencies": {
"lit-html": "^2.6.1"
Expand All @@ -306,6 +308,8 @@
"[email protected]": "patch:friendly-challenge@npm%3A0.9.2#./.yarn/patches/friendly-challenge-npm-0.9.2-db0cad46d3.patch",
"react-dom@^18.2.0": "patch:react-dom@npm%3A18.2.0#./.yarn/patches/react-dom-npm-18.2.0-dd675bca1c.patch",
"react-dev-utils/fork-ts-checker-webpack-plugin": "^6.5.3",
"react-scripts/webpack": "5.94.0",
"react-scripts/workbox-webpack-plugin": "^7.1.0",
"p-queue": "^6.6.2",
"web3": "4.2.1-dev.a0d6730.0",
"@wherever/react-notification-feed/wagmi": "^0.10.12",
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit c9ff576

Please sign in to comment.