diff --git a/apps/web/src/app/app.tsx b/apps/web/src/app/app.tsx index 02b0dc1..543aa3b 100644 --- a/apps/web/src/app/app.tsx +++ b/apps/web/src/app/app.tsx @@ -10,15 +10,15 @@ const client = new QueryClient() export function App() { return ( - - - + + + - - - + + + ) } diff --git a/apps/web/src/app/features/solana/solana-provider.tsx b/apps/web/src/app/features/solana/solana-provider.tsx index e81df5e..de3537c 100644 --- a/apps/web/src/app/features/solana/solana-provider.tsx +++ b/apps/web/src/app/features/solana/solana-provider.tsx @@ -7,13 +7,11 @@ import { useWallet, WalletProvider, } from '@solana/wallet-adapter-react' -import { WalletModalProvider, WalletMultiButton } from '@solana/wallet-adapter-react-ui' +import { WalletModalProvider, WalletMultiButton } from '@pubkeyapp/wallet-adapter-mantine-ui' import { SolflareWalletAdapter } from '@solana/wallet-adapter-solflare' import { ReactNode, useCallback, useMemo } from 'react' import { toWalletAdapterNetwork, useCluster } from '../cluster/cluster-data-access' -require('@solana/wallet-adapter-react-ui/styles.css') - export const WalletButton = WalletMultiButton export function SolanaProvider({ children }: { children: ReactNode }) { diff --git a/package.json b/package.json index 579ae15..499511b 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "private": true, "packageManager": "pnpm@8.14.0", "dependencies": { + "@beeman/preset-anchor": "^2.0.0", "@coral-xyz/anchor": "^0.29.0", "@mantine/core": "^7.3.0", "@mantine/dates": "^7.3.0", @@ -23,7 +24,7 @@ "@mantine/notifications": "^7.3.0", "@mantine/spotlight": "^7.3.0", "@nx/devkit": "17.2.7", - "@beeman/preset-anchor": "^2.0.0", + "@pubkeyapp/wallet-adapter-mantine-ui": "^2.3.0", "@solana/spl-token": "^0.3.9", "@solana/wallet-adapter-base": "^0.9.23", "@solana/wallet-adapter-react": "^0.15.35", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f62d973..2676842 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,6 +38,9 @@ dependencies: '@nx/devkit': specifier: 17.2.7 version: 17.2.7(nx@17.2.7) + '@pubkeyapp/wallet-adapter-mantine-ui': + specifier: ^2.3.0 + version: 2.3.0(@mantine/core@7.3.0)(@solana/wallet-adapter-base@0.9.23)(@solana/wallet-adapter-react@0.15.35)(@tabler/icons-react@2.42.0)(react@18.2.0) '@solana/spl-token': specifier: ^0.3.9 version: 0.3.9(@solana/web3.js@1.87.6) @@ -3097,6 +3100,22 @@ packages: webpack: 5.89.0(@swc/core@1.3.100) dev: true + /@pubkeyapp/wallet-adapter-mantine-ui@2.3.0(@mantine/core@7.3.0)(@solana/wallet-adapter-base@0.9.23)(@solana/wallet-adapter-react@0.15.35)(@tabler/icons-react@2.42.0)(react@18.2.0): + resolution: {integrity: sha512-lqJdTDh1Novy7O6/M6bYpdumYtBBqHaZtqRko4dELHUR8bvKYq2zo8sl7kP0h+hwrELM756ToknKvRxok3Po5g==} + peerDependencies: + '@mantine/core': ^7.0.0 + '@solana/wallet-adapter-base': ^0.9.23 + '@solana/wallet-adapter-react': ^0.15.35 + '@tabler/icons-react': ^2.34.0 + react: ^18.2.0 + dependencies: + '@mantine/core': 7.3.0(@mantine/hooks@7.3.0)(@types/react@18.2.42)(react-dom@18.2.0)(react@18.2.0) + '@solana/wallet-adapter-base': 0.9.23(@solana/web3.js@1.87.6) + '@solana/wallet-adapter-react': 0.15.35(@solana/web3.js@1.87.6)(bs58@4.0.1)(react-native@0.72.7)(react@18.2.0) + '@tabler/icons-react': 2.42.0(react@18.2.0) + react: 18.2.0 + dev: false + /@react-native-async-storage/async-storage@1.21.0(react-native@0.72.7): resolution: {integrity: sha512-JL0w36KuFHFCvnbOXRekqVAUplmOyT/OuCQkogo6X98MtpSaJOKEAeZnYO8JB0U/RIEixZaGI5px73YbRm/oag==} peerDependencies: