Skip to content

Commit

Permalink
Merge pull request #5883 from leather-io/release/bitflow-update
Browse files Browse the repository at this point in the history
release: bitflow-update
  • Loading branch information
kyranjamie authored Oct 7, 2024
2 parents aa8ffe8 + 0717b12 commit f83bf8a
Show file tree
Hide file tree
Showing 171 changed files with 6,700 additions and 5,071 deletions.
4 changes: 4 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ SENTRY_DSN=sentrydsn
TRANSAK_API_KEY=transakapikey
WALLET_ENVIRONMENT=development
BESTINSLOT_API_KEY=bestinslotapikey
BITFLOW_API_HOST=bitflowapihost
BITFLOW_API_KEY=bitflowapikey
BITFLOW_STACKS_API_HOST=bitflowstacksapihost
BITFLOW_READONLY_CALL_API_HOST=bitflowreadonlycallapihost
4 changes: 4 additions & 0 deletions .github/workflows/build-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ jobs:
SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY_STAGING }}
TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
BESTINSLOT_API_KEY: ${{ secrets.BESTINSLOT_API_KEY }}
BITFLOW_API_HOST: ${{ secrets.BITFLOW_API_HOST }}
BITFLOW_API_KEY: ${{ secrets.BITFLOW_API_KEY }}
BITFLOW_STACKS_API_HOST: ${{ secrets.BITFLOW_STACKS_API_HOST }}
BITFLOW_READONLY_CALL_API_HOST: ${{ secrets.BITFLOW_READONLY_CALL_API_HOST }}
PR_NUMBER: ${{ github.event.number }}
COMMIT_SHA: ${{ needs.sha-hash.outputs.SHORT_SHA }}

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/development-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ env:
SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY_STAGING }}
TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
BESTINSLOT_API_KEY: ${{ secrets.BESTINSLOT_API_KEY }}
BITFLOW_API_HOST: ${{ secrets.BITFLOW_API_HOST }}
BITFLOW_API_KEY: ${{ secrets.BITFLOW_API_KEY }}
BITFLOW_STACKS_API_HOST: ${{ secrets.BITFLOW_STACKS_API_HOST }}
BITFLOW_READONLY_CALL_API_HOST: ${{ secrets.BITFLOW_READONLY_CALL_API_HOST }}
PREVIEW_RELEASE: true
WALLET_ENVIRONMENT: preview

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ name: Integration tests
env:
CI: true
WALLET_ENVIRONMENT: testing
BITFLOW_API_HOST: ${{ secrets.BITFLOW_API_HOST }}
BITFLOW_API_KEY: ${{ secrets.BITFLOW_API_KEY }}
BITFLOW_STACKS_API_HOST: ${{ secrets.BITFLOW_STACKS_API_HOST }}
BITFLOW_READONLY_CALL_API_HOST: ${{ secrets.BITFLOW_READONLY_CALL_API_HOST }}

on:
push:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/publish-extensions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ env:
SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY }}
TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
BESTINSLOT_API_KEY: ${{ secrets.BESTINSLOT_API_KEY }}
BITFLOW_API_HOST: ${{ secrets.BITFLOW_API_HOST }}
BITFLOW_API_KEY: ${{ secrets.BITFLOW_API_KEY }}
BITFLOW_STACKS_API_HOST: ${{ secrets.BITFLOW_STACKS_API_HOST }}
BITFLOW_READONLY_CALL_API_HOST: ${{ secrets.BITFLOW_READONLY_CALL_API_HOST }}
WALLET_ENVIRONMENT: production
IS_PUBLISHING: true

Expand Down
34 changes: 34 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,40 @@ const config: StorybookConfig = {
chrome: [path.join(__dirname, '../tests/mocks/mock-chrome.ts'), 'chrome'],
})
);
config.module ??= {};
config.module.rules ??= [];
// This modifies the existing image rule to exclude `.svg` files
// so we can load it instead with @svgr/webpack
const imageRule = config.module.rules.find((rule: any) => {
if (rule && typeof rule !== 'string' && rule.test instanceof RegExp) {
return rule.test.test('.svg');
}
});
if (imageRule && typeof imageRule !== 'string') {
imageRule.exclude = /\.svg$/;
}
config.module.rules.push({
test: /\.svg$/,
use: [
{
loader: '@svgr/webpack',
options: {
svgoConfig: {
plugins: [
{
name: 'preset-default',
params: {
overrides: {
removeViewBox: false,
},
},
},
],
},
},
},
],
});
return config;
},
};
Expand Down
81 changes: 46 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
"description": "Leather is a browser extension for interacting with Stacks apps",
"private": true,
"version": "6.47.1",
"packageManager": "pnpm@9.1.4",
"packageManager": "pnpm@9.11.0",
"author": {
"name": "Leather Wallet LLC"
},
"type": "module",
"engineStrict": true,
"engines": {
"node": ">=18.0.0 <22.0.0"
},
"scripts": {
"dev": "concurrently --raw \"node webpack/dev-server.js\" \"redux-devtools --hostname=localhost --port=8000\"",
"dev:test-app": "webpack serve --config test-app/webpack/webpack.config.dev.cjs",
Expand Down Expand Up @@ -137,28 +141,28 @@
"@coinbase/cbpay-js": "2.1.0",
"@fungible-systems/zone-file": "2.0.0",
"@hirosystems/token-metadata-api-client": "1.2.0",
"@leather.io/bitcoin": "0.11.2",
"@leather.io/constants": "0.9.1",
"@leather.io/crypto": "1.4.2",
"@leather.io/models": "0.13.0",
"@leather.io/query": "2.7.0",
"@leather.io/stacks": "1.0.2",
"@leather.io/bitcoin": "0.13.2",
"@leather.io/constants": "0.12.1",
"@leather.io/crypto": "1.6.2",
"@leather.io/models": "0.17.0",
"@leather.io/query": "2.13.1",
"@leather.io/stacks": "1.1.5",
"@leather.io/tokens": "0.9.0",
"@leather.io/ui": "1.16.0",
"@leather.io/utils": "0.13.2",
"@leather.io/ui": "1.27.1",
"@leather.io/utils": "0.15.0",
"@ledgerhq/hw-transport-webusb": "6.27.19",
"@noble/hashes": "1.4.0",
"@noble/hashes": "1.5.0",
"@noble/secp256k1": "2.1.0",
"@octokit/types": "12.4.0",
"@radix-ui/react-dialog": "1.0.5",
"@radix-ui/react-dropdown-menu": "2.0.6",
"@radix-ui/react-tooltip": "1.0.7",
"@radix-ui/themes": "2.0.3",
"@reduxjs/toolkit": "2.2.3",
"@scure/base": "1.1.6",
"@scure/bip32": "1.4.0",
"@scure/bip39": "1.3.0",
"@scure/btc-signer": "1.3.2",
"@reduxjs/toolkit": "2.2.7",
"@scure/base": "1.1.9",
"@scure/bip32": "1.5.0",
"@scure/bip39": "1.4.0",
"@scure/btc-signer": "1.4.0",
"@segment/analytics-next": "1.70.0",
"@sentry/browser": "8.26.0",
"@sentry/tracing": "7.106.0",
Expand All @@ -184,27 +188,30 @@
"@types/lodash.uniqby": "4.7.7",
"@typescript-eslint/eslint-plugin": "7.5.0",
"@zondax/ledger-stacks": "1.0.4",
"alex-sdk": "2.1.3",
"alex-sdk": "2.1.4",
"are-passive-events-supported": "1.1.1",
"argon2-browser": "1.18.0",
"assert": "2.1.0",
"axios": "1.7.4",
"axios": "1.7.7",
"base64url": "3.0.1",
"bignumber.js": "9.1.2",
"bitcoin-address-validation": "2.2.1",
"bitcoinjs-lib": "6.1.5",
"bitflow-sdk": "1.6.1",
"bn.js": "5.2.1",
"browserify-fs": "1.0.0",
"c32check": "2.0.0",
"chroma-js": "2.4.2",
"coinselect": "3.1.13",
"compare-versions": "6.1.0",
"cross-fetch": "4.0.0",
"css-loader": "7.1.0",
"css-loader": "7.1.2",
"dayjs": "1.11.8",
"dompurify": "3.1.4",
"dotenv": "16.4.5",
"ecdsa-sig-formatter": "1.0.11",
"formik": "2.4.5",
"framer-motion": "11.9.0",
"jotai": "2.2.1",
"jotai-redux": "0.2.1",
"jsontokens": "4.0.1",
Expand All @@ -214,10 +221,10 @@
"lodash.uniqby": "4.7.0",
"micro-packed": "0.3.2",
"object-hash": "3.0.0",
"observable-hooks": "4.2.3",
"os-browserify": "0.3.0",
"p-queue": "8.0.1",
"pino": "8.19.0",
"postcss-preset-env": "9.5.4",
"postcss-preset-env": "10.0.5",
"prism-react-renderer": "2.3.1",
"prismjs": "1.29.0",
"promise-memoize": "1.2.1",
Expand All @@ -231,8 +238,8 @@
"react-intersection-observer": "9.5.2",
"react-lottie": "1.2.4",
"react-qr-code": "2.0.12",
"react-redux": "9.1.0",
"react-router-dom": "6.23.1",
"react-redux": "9.1.2",
"react-router-dom": "6.26.2",
"react-virtuoso": "4.9.0",
"redux-persist": "6.0.0",
"remark-gfm": "4.0.0",
Expand All @@ -255,12 +262,12 @@
"@btckit/types": "0.0.19",
"@chromatic-com/storybook": "1.2.23",
"@leather.io/eslint-config": "0.7.0",
"@leather.io/panda-preset": "0.3.8",
"@leather.io/panda-preset": "0.4.0",
"@leather.io/prettier-config": "0.6.0",
"@leather.io/rpc": "2.1.6",
"@leather.io/rpc": "2.1.10",
"@ls-lint/ls-lint": "2.2.3",
"@mdx-js/loader": "3.0.0",
"@pandacss/dev": "0.40.1",
"@pandacss/dev": "0.46.1",
"@playwright/test": "1.44.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.13",
"@redux-devtools/cli": "4.0.0",
Expand All @@ -283,8 +290,8 @@
"@storybook/theming": "8.2.4",
"@svgr/webpack": "8.1.0",
"@types/argon2-browser": "1.18.4",
"@types/bn.js": "5.1.5",
"@types/chrome": "0.0.260",
"@types/bn.js": "5.1.6",
"@types/chrome": "0.0.273",
"@types/dompurify": "3.0.5",
"@types/download": "8.0.5",
"@types/html-webpack-plugin": "3.2.9",
Expand All @@ -296,15 +303,15 @@
"@types/promise-memoize": "1.2.4",
"@types/punycode": "2.1.4",
"@types/qrcode.react": "1.0.5",
"@types/react": "18.3.3",
"@types/react": "18.3.10",
"@types/react-dom": "18.3.0",
"@types/react-lottie": "1.2.10",
"@types/react-router-dom": "5.3.3",
"@types/remote-redux-devtools": "0.5.8",
"@types/valid-url": "1.0.7",
"@types/webextension-polyfill": "0.10.4",
"@types/webpack": "5.28.5",
"@types/zxcvbn": "4.4.4",
"@types/zxcvbn": "4.4.5",
"@typescript-eslint/parser": "7.5.0",
"@vitest/coverage-istanbul": "2.0.5",
"audit-ci": "6.6.1",
Expand All @@ -321,10 +328,10 @@
"cross-env": "7.0.3",
"crypto-browserify": "3.12.0",
"deepmerge": "4.3.1",
"dependency-cruiser": "16.3.2",
"dependency-cruiser": "16.4.2",
"dotenv-webpack": "8.1.0",
"esbuild": "0.23.1",
"esbuild-loader": "4.1.0",
"esbuild": "0.24.0",
"esbuild-loader": "4.2.2",
"eslint-plugin-deprecation": "2.0.0",
"eslint-plugin-mdx": "3.1.5",
"eslint-plugin-react": "7.34.1",
Expand All @@ -334,7 +341,7 @@
"generate-json-webpack-plugin": "2.0.0",
"html-webpack-plugin": "5.6.0",
"jsdom": "22.1.0",
"postcss": "8.4.38",
"postcss": "8.4.47",
"postcss-loader": "8.1.1",
"prettier": "3.3.3",
"process": "0.11.10",
Expand All @@ -352,7 +359,7 @@
"vm-browserify": "1.1.2",
"web-ext": "7.8.0",
"web-ext-submit": "7.8.0",
"webpack": "5.91.0",
"webpack": "5.94.0",
"webpack-bundle-analyzer": "4.10.2",
"webpack-cli": "5.1.4",
"webpack-dev-server": "4.15.1",
Expand All @@ -361,18 +368,22 @@
},
"resolutions": {
"axios": "1.7.4",
"body-parser": "1.20.3",
"braces": "3.0.3",
"dset": "3.1.4",
"fast-xml-parser": "4.4.1",
"nanoid": "3.3.4",
"socket.io-parser": "4.2.4",
"wrap-ansi": "7.0.0",
"webpack-dev-middleware": "5.3.4",
"eslint": "8.56.0",
"path-to-regexp": "0.1.10",
"ws": "8.17.1"
},
"pnpm": {
"overrides": {
"eslint": "8.56.0"
"eslint": "8.56.0",
"levelup>semver": "5.7.2"
}
},
"keywords": [
Expand Down
3 changes: 2 additions & 1 deletion panda.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { globalCss } from './theme/global/global';

export default defineConfig({
preflight: true,

include: [
'./node_modules/@leather.io/ui/dist-web/src/**/*.{js,jsx,ts,tsx}',
'./node_modules/@leather.io/ui/dist-web/**/*.{js,jsx,ts,tsx}',
'./src/**/*.{js,jsx,ts,tsx}',
],

Expand Down
Loading

0 comments on commit f83bf8a

Please sign in to comment.