From ed51e172cc08720815f88178fed8c88026bfd780 Mon Sep 17 00:00:00 2001 From: Connor Prussin Date: Wed, 9 Oct 2024 19:53:04 -0700 Subject: [PATCH] feat(staking): re-enable stats --- apps/staking/package.json | 8 +- apps/staking/src/components/Header/index.tsx | 6 +- apps/staking/src/components/Header/stats.tsx | 2 +- pnpm-lock.yaml | 108 ++++++++++++++++--- 4 files changed, 100 insertions(+), 24 deletions(-) diff --git a/apps/staking/package.json b/apps/staking/package.json index a37d482a6..60ce99811 100644 --- a/apps/staking/package.json +++ b/apps/staking/package.json @@ -31,11 +31,11 @@ "@react-aria/toast": "3.0.0-beta.16", "@react-hookz/web": "^24.0.4", "@react-stately/toast": "3.0.0-beta.6", - "@solana/wallet-adapter-base": "^0.9.20", - "@solana/wallet-adapter-react": "^0.15.28", - "@solana/wallet-adapter-react-ui": "^0.9.27", + "@solana/wallet-adapter-base": "^0.9.23", + "@solana/wallet-adapter-react": "^0.15.35", + "@solana/wallet-adapter-react-ui": "^0.9.35", "@solana/wallet-adapter-wallets": "0.19.10", - "@solana/web3.js": "^1.95.2", + "@solana/web3.js": "1.92.3", "bcp-47": "^2.1.0", "clsx": "^2.1.1", "dnum": "^2.13.1", diff --git a/apps/staking/src/components/Header/index.tsx b/apps/staking/src/components/Header/index.tsx index 153951d30..f04896dc4 100644 --- a/apps/staking/src/components/Header/index.tsx +++ b/apps/staking/src/components/Header/index.tsx @@ -5,7 +5,7 @@ import { CurrentStakeAccount } from "./current-stake-account"; import { HelpMenu } from "./help-menu"; import Logo from "./logo.svg"; import Logomark from "./logomark.svg"; -// import { Stats } from "./stats"; +import { Stats } from "./stats"; import { Link } from "../Link"; import { MaxWidth } from "../MaxWidth"; import { WalletButton } from "../WalletButton"; @@ -29,7 +29,7 @@ export const Header = ({ - {/* */} +
@@ -39,6 +39,6 @@ export const Header = ({
- {/* */} + ); diff --git a/apps/staking/src/components/Header/stats.tsx b/apps/staking/src/components/Header/stats.tsx index 65a6d33b6..1d76abfe1 100644 --- a/apps/staking/src/components/Header/stats.tsx +++ b/apps/staking/src/components/Header/stats.tsx @@ -2,7 +2,7 @@ import { PythStakingClient } from "@pythnetwork/staking-sdk"; import { useConnection } from "@solana/wallet-adapter-react"; -import { Connection } from "@solana/web3.js"; +import type { Connection } from "@solana/web3.js"; import clsx from "clsx"; import type { HTMLProps } from "react"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d26c31616..11124b6e6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -111,7 +111,7 @@ importers: version: 4.9.1 '@cprussin/eslint-config': specifier: ^3.0.0 - version: 3.0.0(@typescript-eslint/eslint-plugin@7.13.1(eslint@9.5.0)(typescript@5.5.2))(jest@29.7.0(@types/node@20.14.7)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)))(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2))(typescript@5.5.2) + version: 3.0.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0)(typescript@5.5.2))(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(jest@29.7.0(@types/node@20.14.7)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)))(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2))(typescript@5.5.2) '@cprussin/jest-config': specifier: ^1.4.1 version: 1.4.1(@babel/core@7.24.7)(@jest/globals@29.7.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(@types/jest@29.5.12)(@types/node@20.14.7)(babel-jest@29.7.0(@babel/core@7.24.7))(bufferutil@4.0.8)(eslint@9.5.0)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2))(utf-8-validate@5.0.10) @@ -355,13 +355,13 @@ importers: specifier: 3.0.0-beta.6 version: 3.0.0-beta.6(react@18.3.1) '@solana/wallet-adapter-base': - specifier: ^0.9.20 + specifier: ^0.9.23 version: 0.9.23(@solana/web3.js@1.92.3(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)) '@solana/wallet-adapter-react': - specifier: ^0.15.28 + specifier: ^0.15.35 version: 0.15.35(@solana/web3.js@1.92.3(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10))(bs58@6.0.0)(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10))(react@18.3.1) '@solana/wallet-adapter-react-ui': - specifier: ^0.9.27 + specifier: ^0.9.35 version: 0.9.35(@solana/web3.js@1.92.3(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10))(bs58@6.0.0)(react-dom@18.3.1(react@18.3.1))(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10))(react@18.3.1) '@solana/wallet-adapter-wallets': specifier: 0.19.10 @@ -420,7 +420,7 @@ importers: version: 4.9.1 '@cprussin/eslint-config': specifier: ^3.0.0 - version: 3.0.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4))(typescript@5.5.4) + version: 3.0.0(@typescript-eslint/eslint-plugin@7.13.1(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4))(typescript@5.5.4) '@cprussin/jest-config': specifier: ^1.4.1 version: 1.4.1(@babel/core@7.24.7)(@jest/globals@29.7.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(@types/jest@29.5.12)(@types/node@22.2.0)(babel-jest@29.7.0(@babel/core@7.24.7))(bufferutil@4.0.8)(eslint@9.9.0(jiti@1.21.0))(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4))(utf-8-validate@5.0.10) @@ -24638,6 +24638,45 @@ snapshots: transitivePeerDependencies: - debug + '@cprussin/eslint-config@3.0.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0)(typescript@5.5.2))(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(jest@29.7.0(@types/node@20.14.7)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)))(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2))(typescript@5.5.2)': + dependencies: + '@babel/core': 7.24.7 + '@babel/eslint-parser': 7.24.7(@babel/core@7.24.7)(eslint@9.5.0) + '@babel/plugin-syntax-import-assertions': 7.24.7(@babel/core@7.24.7) + '@eslint/compat': 1.1.0 + '@eslint/eslintrc': 3.1.0 + '@eslint/js': 9.5.0 + '@next/eslint-plugin-next': 14.2.3 + eslint: 9.5.0 + eslint-config-prettier: 9.1.0(eslint@9.5.0) + eslint-config-turbo: 1.13.4(eslint@9.5.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0) + eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0)(jest@29.7.0(@types/node@20.14.7)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)))(typescript@5.5.2) + eslint-plugin-jest-dom: 5.4.0(eslint@9.5.0) + eslint-plugin-jsonc: 2.16.0(eslint@9.5.0) + eslint-plugin-jsx-a11y: 6.8.0(eslint@9.5.0) + eslint-plugin-n: 17.9.0(eslint@9.5.0) + eslint-plugin-react: 7.34.2(eslint@9.5.0) + eslint-plugin-react-hooks: 4.6.2(eslint@9.5.0) + eslint-plugin-storybook: 0.8.0(eslint@9.5.0)(typescript@5.5.2) + eslint-plugin-tailwindcss: 3.17.3(tailwindcss@3.4.4(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2))) + eslint-plugin-testing-library: 6.2.2(eslint@9.5.0)(typescript@5.5.2) + eslint-plugin-tsdoc: 0.3.0 + eslint-plugin-unicorn: 53.0.0(eslint@9.5.0) + globals: 15.6.0 + tailwindcss: 3.4.4(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)) + typescript-eslint: 7.13.1(eslint@9.5.0)(typescript@5.5.2) + transitivePeerDependencies: + - '@testing-library/dom' + - '@typescript-eslint/eslint-plugin' + - '@typescript-eslint/parser' + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - jest + - supports-color + - ts-node + - typescript + '@cprussin/eslint-config@3.0.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4))(typescript@5.5.4)': dependencies: '@babel/core': 7.24.7 @@ -24651,7 +24690,7 @@ snapshots: eslint-config-prettier: 9.1.0(eslint@9.5.0) eslint-config-turbo: 1.13.4(eslint@9.5.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.5.0) - eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.13.1(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.5.0)(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(typescript@5.5.4) + eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.5.0)(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(typescript@5.5.4) eslint-plugin-jest-dom: 5.4.0(eslint@9.5.0) eslint-plugin-jsonc: 2.16.0(eslint@9.5.0) eslint-plugin-jsx-a11y: 6.8.0(eslint@9.5.0) @@ -24677,7 +24716,7 @@ snapshots: - ts-node - typescript - '@cprussin/eslint-config@3.0.0(@typescript-eslint/eslint-plugin@7.13.1(eslint@9.5.0)(typescript@5.5.2))(jest@29.7.0(@types/node@20.14.7)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)))(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2))(typescript@5.5.2)': + '@cprussin/eslint-config@3.0.0(@typescript-eslint/eslint-plugin@7.13.1(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4))(typescript@5.5.4)': dependencies: '@babel/core': 7.24.7 '@babel/eslint-parser': 7.24.7(@babel/core@7.24.7)(eslint@9.5.0) @@ -24689,22 +24728,22 @@ snapshots: eslint: 9.5.0 eslint-config-prettier: 9.1.0(eslint@9.5.0) eslint-config-turbo: 1.13.4(eslint@9.5.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.5.0) - eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0)(jest@29.7.0(@types/node@20.14.7)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)))(typescript@5.5.2) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0) + eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.5.0)(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(typescript@5.5.4) eslint-plugin-jest-dom: 5.4.0(eslint@9.5.0) eslint-plugin-jsonc: 2.16.0(eslint@9.5.0) eslint-plugin-jsx-a11y: 6.8.0(eslint@9.5.0) eslint-plugin-n: 17.9.0(eslint@9.5.0) eslint-plugin-react: 7.34.2(eslint@9.5.0) eslint-plugin-react-hooks: 4.6.2(eslint@9.5.0) - eslint-plugin-storybook: 0.8.0(eslint@9.5.0)(typescript@5.5.2) - eslint-plugin-tailwindcss: 3.17.3(tailwindcss@3.4.4(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2))) - eslint-plugin-testing-library: 6.2.2(eslint@9.5.0)(typescript@5.5.2) + eslint-plugin-storybook: 0.8.0(eslint@9.5.0)(typescript@5.5.4) + eslint-plugin-tailwindcss: 3.17.3(tailwindcss@3.4.4(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4))) + eslint-plugin-testing-library: 6.2.2(eslint@9.5.0)(typescript@5.5.4) eslint-plugin-tsdoc: 0.3.0 eslint-plugin-unicorn: 53.0.0(eslint@9.5.0) globals: 15.6.0 - tailwindcss: 3.4.4(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)) - typescript-eslint: 7.13.1(eslint@9.5.0)(typescript@5.5.2) + tailwindcss: 3.4.4(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)) + typescript-eslint: 7.13.1(eslint@9.5.0)(typescript@5.5.4) transitivePeerDependencies: - '@testing-library/dom' - '@typescript-eslint/eslint-plugin' @@ -39986,6 +40025,16 @@ snapshots: transitivePeerDependencies: - supports-color + eslint-module-utils@2.8.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint@9.5.0): + dependencies: + debug: 3.2.7 + optionalDependencies: + '@typescript-eslint/parser': 7.13.1(eslint@9.5.0)(typescript@5.5.2) + eslint: 9.5.0 + eslint-import-resolver-node: 0.3.9 + transitivePeerDependencies: + - supports-color + eslint-module-utils@2.8.1(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@9.5.0): dependencies: debug: 3.2.7 @@ -40003,6 +40052,33 @@ snapshots: eslint: 9.5.0 eslint-compat-utils: 0.5.1(eslint@9.5.0) + eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0): + dependencies: + array-includes: 3.1.8 + array.prototype.findlastindex: 1.2.5 + array.prototype.flat: 1.3.2 + array.prototype.flatmap: 1.3.2 + debug: 3.2.7 + doctrine: 2.1.0 + eslint: 9.5.0 + eslint-import-resolver-node: 0.3.9 + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint@9.5.0) + hasown: 2.0.2 + is-core-module: 2.13.1 + is-glob: 4.0.3 + minimatch: 3.1.2 + object.fromentries: 2.0.8 + object.groupby: 1.0.3 + object.values: 1.2.0 + semver: 6.3.1 + tsconfig-paths: 3.15.0 + optionalDependencies: + '@typescript-eslint/parser': 7.13.1(eslint@9.5.0)(typescript@5.5.2) + transitivePeerDependencies: + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + eslint-plugin-import@2.29.1(@typescript-eslint/parser@8.3.0(eslint@8.56.0)(typescript@5.4.5))(eslint@8.56.0): dependencies: array-includes: 3.1.8 @@ -40063,7 +40139,7 @@ snapshots: eslint: 9.5.0 requireindex: 1.2.0 - eslint-plugin-jest@28.6.0(@typescript-eslint/eslint-plugin@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0)(jest@29.7.0(@types/node@20.14.7)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)))(typescript@5.5.2): + eslint-plugin-jest@28.6.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0)(typescript@5.5.2))(eslint@9.5.0)(jest@29.7.0(@types/node@20.14.7)(ts-node@10.9.2(@types/node@20.14.7)(typescript@5.5.2)))(typescript@5.5.2): dependencies: '@typescript-eslint/utils': 7.7.1(eslint@9.5.0)(typescript@5.5.2) eslint: 9.5.0 @@ -40074,7 +40150,7 @@ snapshots: - supports-color - typescript - eslint-plugin-jest@28.6.0(@typescript-eslint/eslint-plugin@7.13.1(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.5.0)(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(typescript@5.5.4): + eslint-plugin-jest@28.6.0(@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@8.3.0(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.9.0(jiti@1.21.0))(typescript@5.5.4))(eslint@9.5.0)(jest@29.7.0(@types/node@22.2.0)(ts-node@10.9.2(@types/node@22.2.0)(typescript@5.5.4)))(typescript@5.5.4): dependencies: '@typescript-eslint/utils': 7.7.1(eslint@9.5.0)(typescript@5.5.4) eslint: 9.5.0