From 68f6d53062fcaeadc088b938734b81666d3731d8 Mon Sep 17 00:00:00 2001 From: "Jason M. Hasperhoven" Date: Mon, 6 Jan 2025 18:32:48 +0100 Subject: [PATCH 1/3] Add resolution for feather js (#1973) * Add resolution for feather js * use pnpm overrides * Upd * Use resolutions directly * try again * lockfile --------- Co-authored-by: Max Korsunov --- package.json | 3 +- pnpm-lock.yaml | 75 +++++++++++++++++++++++++------------------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index c4ffe5901..b94defb5b 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,8 @@ }, "pnpm": { "overrides": { - "typescript": "5.5.3" + "typescript": "5.5.3", + "@hexxagon/feather.js": "npm:@terra-money/feather.js@1.0.9" } }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1e31c52c7..d39b863a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,7 @@ settings: overrides: typescript: 5.5.3 + '@hexxagon/feather.js': npm:@terra-money/feather.js@1.0.9 importers: @@ -43,7 +44,7 @@ importers: version: 8.4.2(@storybook/test@8.4.2(storybook@8.4.2(bufferutil@4.0.8)(prettier@3.3.3)(utf-8-validate@5.0.10)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.1)(storybook@8.4.2(bufferutil@4.0.8)(prettier@3.3.3)(utf-8-validate@5.0.10))(typescript@5.5.3)(vite@5.3.3(@types/node@22.10.2)(terser@5.37.0)) '@testing-library/jest-dom': specifier: ^6.4.5 - version: 6.4.6(vitest@1.6.0) + version: 6.4.6(vitest@1.6.0(@types/node@22.10.2)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.37.0)) '@testing-library/react': specifier: ^15.0.7 version: 15.0.7(@types/react@18.3.16)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -106,7 +107,7 @@ importers: version: 2.0.12(eslint@9.6.0) eslint-plugin-vitest: specifier: ^0.5.4 - version: 0.5.4(eslint@9.6.0)(typescript@5.5.3)(vitest@1.6.0) + version: 0.5.4(eslint@9.6.0)(typescript@5.5.3)(vitest@1.6.0(@types/node@22.10.2)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.37.0)) jsdom: specifier: ^24.0.0 version: 24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10) @@ -451,7 +452,7 @@ importers: version: 2.0.12(eslint@9.6.0) eslint-plugin-vitest: specifier: ^0.5.4 - version: 0.5.4(eslint@9.6.0)(typescript@5.5.3)(vitest@1.6.0) + version: 0.5.4(eslint@9.6.0)(typescript@5.5.3)(vitest@1.6.0(@types/node@22.10.2)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.37.0)) devDependencies: prettier: specifier: ^3.3.3 @@ -2870,16 +2871,12 @@ packages: peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - '@hexxagon/feather.js@1.0.11': - resolution: {integrity: sha512-PkPV4USLqmu9r+9UdGt3dYAcc1xS6ykZGUt+pfXrso/D0XSQUASKSHk6ZLbnU2Aum1zWjzS+3EJYCeG3IUYOWg==} - engines: {node: '>=16'} - '@hexxagon/station-connector@1.0.19': resolution: {integrity: sha512-VR84MowCciK+/xvRAAXKXWf8Bc/IAkUQHwBi/MH3p3JNshNdEbUeCYwzriIDJYSVCslZlnIgrA0AgmyIEHyaLQ==} engines: {node: '>=16'} peerDependencies: '@cosmjs/amino': ^0.31.0 - '@hexxagon/feather.js': ^2.1.0-beta.5 + '@hexxagon/feather.js': npm:@terra-money/feather.js@1.0.9 axios: ^0.27.2 '@humanwhocodes/module-importer@1.0.1': @@ -5765,6 +5762,10 @@ packages: '@tanstack/virtual-core@3.10.9': resolution: {integrity: sha512-kBknKOKzmeR7lN+vSadaKWXaLS0SZZG+oqpQ/k80Q6g9REn6zRHS/ZYdrIzHnpHgy/eWs00SujveUN/GJT2qTw==} + '@terra-money/feather.js@1.0.9': + resolution: {integrity: sha512-GEEghmwvN4QhZny7csdVpE5D2TrrWOWilcaDw8Z3jsuG22bEC0LHa6rd0YYnEOhGCQdob/HZcQ3SQJYRP9uHJQ==} + engines: {node: '>=16'} + '@terra-money/feather.js@1.2.1': resolution: {integrity: sha512-OyXkWriNwb0lCF45eMmtjdOPEmfGKJxgGSnxpM7VxD0Vqr1qqtlcYyQG9wOHXNQrExvZv+uo922B2ZA4S77HsQ==} engines: {node: '>=16'} @@ -14766,8 +14767,8 @@ snapshots: '@cosmjs/amino': 0.31.3 '@cosmjs/proto-signing': 0.32.4 '@cosmos-kit/core': 2.15.0(@react-native-async-storage/async-storage@1.24.0(react-native@0.76.5(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(utf-8-validate@5.0.10) - '@hexxagon/feather.js': 1.0.11 - '@hexxagon/station-connector': 1.0.19(@cosmjs/amino@0.31.3)(@hexxagon/feather.js@1.0.11)(axios@1.7.2) + '@hexxagon/feather.js': '@terra-money/feather.js@1.0.9' + '@hexxagon/station-connector': 1.0.19(@cosmjs/amino@0.31.3)(@terra-money/feather.js@1.0.9)(axios@1.7.2) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -16249,30 +16250,10 @@ snapshots: dependencies: graphql: 16.9.0 - '@hexxagon/feather.js@1.0.11': - dependencies: - '@classic-terra/terra.proto': 1.1.0 - '@terra-money/legacy.proto': '@terra-money/terra.proto@0.1.7' - '@terra-money/terra.proto': 3.0.5 - axios: 0.27.2 - bech32: 2.0.0 - bip32: 2.0.6 - bip39: 3.1.0 - bufferutil: 4.0.8 - decimal.js: 10.4.3 - jscrypto: 1.0.3 - readable-stream: 3.6.2 - secp256k1: 4.0.4 - tmp: 0.2.3 - utf-8-validate: 5.0.10 - ws: 7.5.10(bufferutil@4.0.8)(utf-8-validate@5.0.10) - transitivePeerDependencies: - - debug - - '@hexxagon/station-connector@1.0.19(@cosmjs/amino@0.31.3)(@hexxagon/feather.js@1.0.11)(axios@1.7.2)': + '@hexxagon/station-connector@1.0.19(@cosmjs/amino@0.31.3)(@terra-money/feather.js@1.0.9)(axios@1.7.2)': dependencies: '@cosmjs/amino': 0.31.3 - '@hexxagon/feather.js': 1.0.11 + '@hexxagon/feather.js': '@terra-money/feather.js@1.0.9' axios: 1.7.2 bech32: 2.0.0 @@ -20800,6 +20781,26 @@ snapshots: '@tanstack/virtual-core@3.10.9': {} + '@terra-money/feather.js@1.0.9': + dependencies: + '@terra-money/legacy.proto': '@terra-money/terra.proto@0.1.7' + '@terra-money/terra.proto': 3.0.5 + axios: 0.27.2 + bech32: 2.0.0 + bip32: 2.0.6 + bip39: 3.1.0 + bufferutil: 4.0.8 + decimal.js: 10.4.3 + jscrypto: 1.0.3 + long: 5.2.3 + readable-stream: 3.6.2 + secp256k1: 4.0.4 + tmp: 0.2.3 + utf-8-validate: 5.0.10 + ws: 7.5.10(bufferutil@4.0.8)(utf-8-validate@5.0.10) + transitivePeerDependencies: + - debug + '@terra-money/feather.js@1.2.1': dependencies: '@ethersproject/bytes': 5.7.0 @@ -20911,7 +20912,7 @@ snapshots: lz-string: 1.5.0 pretty-format: 27.5.1 - '@testing-library/jest-dom@6.4.6(vitest@1.6.0)': + '@testing-library/jest-dom@6.4.6(vitest@1.6.0(@types/node@22.10.2)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.37.0))': dependencies: '@adobe/css-tools': 4.4.0 '@babel/runtime': 7.24.7 @@ -24091,7 +24092,7 @@ snapshots: debug: 4.3.5 enhanced-resolve: 5.17.0 eslint: 9.6.0 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@9.6.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1)(eslint@9.6.0))(eslint@9.6.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-typescript@3.6.1)(eslint@9.6.0) fast-glob: 3.3.2 get-tsconfig: 4.7.5 @@ -24103,7 +24104,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@9.6.0): + eslint-module-utils@2.8.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1)(eslint@9.6.0))(eslint@9.6.0): dependencies: debug: 3.2.7 optionalDependencies: @@ -24141,7 +24142,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.6.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@9.6.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.16.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1)(eslint@9.6.0))(eslint@9.6.0) hasown: 2.0.2 is-core-module: 2.14.0 is-glob: 4.0.3 @@ -24215,7 +24216,7 @@ snapshots: dotenv: 16.0.3 eslint: 9.6.0 - eslint-plugin-vitest@0.5.4(eslint@9.6.0)(typescript@5.5.3)(vitest@1.6.0): + eslint-plugin-vitest@0.5.4(eslint@9.6.0)(typescript@5.5.3)(vitest@1.6.0(@types/node@22.10.2)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.37.0)): dependencies: '@typescript-eslint/utils': 7.16.0(eslint@9.6.0)(typescript@5.5.3) eslint: 9.6.0 From e754ce4967c24048853c4075058f94d3452687ea Mon Sep 17 00:00:00 2001 From: "Jason M. Hasperhoven" Date: Mon, 6 Jan 2025 18:42:38 +0100 Subject: [PATCH 2/3] Update Tooltip message prop to support ReactNode (#1970) * Update Tooltip message prop to support ReactNode * Add changeset --- .changeset/strange-nails-perform.md | 5 +++++ packages/ui/src/Tooltip/tooltip.tsx | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/strange-nails-perform.md diff --git a/.changeset/strange-nails-perform.md b/.changeset/strange-nails-perform.md new file mode 100644 index 000000000..6ca02162d --- /dev/null +++ b/.changeset/strange-nails-perform.md @@ -0,0 +1,5 @@ +--- +'@penumbra-zone/ui': patch +--- + +Update Tooltip message prop to support ReactNode diff --git a/packages/ui/src/Tooltip/tooltip.tsx b/packages/ui/src/Tooltip/tooltip.tsx index 429ab4f2f..2659d411e 100644 --- a/packages/ui/src/Tooltip/tooltip.tsx +++ b/packages/ui/src/Tooltip/tooltip.tsx @@ -12,7 +12,7 @@ export interface TooltipProps { * A string message to show in the tooltip. Note that only strings are * allowed; for interactive content, use a `` or a ``. */ - message: string; + message: string | ReactNode; /** * The trigger for the tooltip. * From 97842ea5f770e9f0fbfd52cccfeebfdc93d06a4b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:46:27 +0400 Subject: [PATCH 3/3] Version Packages (#1974) Co-authored-by: github-actions[bot] --- .changeset/pink-rabbits-fry.md | 5 ----- .changeset/strange-nails-perform.md | 5 ----- apps/minifront/CHANGELOG.md | 6 ++++++ apps/minifront/package.json | 2 +- packages/ui/CHANGELOG.md | 6 ++++++ packages/ui/package.json | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 .changeset/pink-rabbits-fry.md delete mode 100644 .changeset/strange-nails-perform.md diff --git a/.changeset/pink-rabbits-fry.md b/.changeset/pink-rabbits-fry.md deleted file mode 100644 index fa494fbc8..000000000 --- a/.changeset/pink-rabbits-fry.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'minifront': minor ---- - -transaction view ui fixes diff --git a/.changeset/strange-nails-perform.md b/.changeset/strange-nails-perform.md deleted file mode 100644 index 6ca02162d..000000000 --- a/.changeset/strange-nails-perform.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@penumbra-zone/ui': patch ---- - -Update Tooltip message prop to support ReactNode diff --git a/apps/minifront/CHANGELOG.md b/apps/minifront/CHANGELOG.md index 3ceae278b..b451a9b93 100644 --- a/apps/minifront/CHANGELOG.md +++ b/apps/minifront/CHANGELOG.md @@ -1,5 +1,11 @@ # minifront +## 6.28.0 + +### Minor Changes + +- a7b0c29: transaction view ui fixes + ## 6.27.2 ### Patch Changes diff --git a/apps/minifront/package.json b/apps/minifront/package.json index 278aea50c..48be24001 100644 --- a/apps/minifront/package.json +++ b/apps/minifront/package.json @@ -1,6 +1,6 @@ { "name": "minifront", - "version": "6.27.2", + "version": "6.28.0", "private": true, "license": "(MIT OR Apache-2.0)", "type": "module", diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md index dc3e357ae..56d7e24b0 100644 --- a/packages/ui/CHANGELOG.md +++ b/packages/ui/CHANGELOG.md @@ -1,5 +1,11 @@ # @penumbra-zone/ui +## 13.8.1 + +### Patch Changes + +- e754ce4: Update Tooltip message prop to support ReactNode + ## 13.8.0 ### Minor Changes diff --git a/packages/ui/package.json b/packages/ui/package.json index 91a5dd64c..e218f9a15 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@penumbra-zone/ui", - "version": "13.8.0", + "version": "13.8.1", "license": "(MIT OR Apache-2.0)", "description": "UI components for Penumbra", "type": "module",