Skip to content

Commit

Permalink
Merge pull request #7 from Access-Labs-Inc/feat/upgrade-tiplink
Browse files Browse the repository at this point in the history
Upgrade Tiplink integration
  • Loading branch information
martincik authored Jul 11, 2024
2 parents 086a501 + ad7f9a0 commit 87b7419
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ typings/
dist/
stats.json

.build
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
"@solana/wallet-adapter-react-ui": "^0.9.35",
"@solana/web3.js": "^1.90.2",
"@supercharge/promise-pool": "^3.2.0",
"@tiplink/wallet-adapter": "^2.1.16",
"@tiplink/wallet-adapter-react-ui": "^0.1.11",
"@tiplink/wallet-adapter": "^2.1.18",
"@tiplink/wallet-adapter-react-ui": "^1.0.0",
"bn.js": "^5.2.1",
"borsh": "^0.7.0",
"clsx": "^1.2.1",
Expand Down
6 changes: 3 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@solana/wallet-adapter-react';
import { WalletModalProvider } from '@solana/wallet-adapter-react-ui';
import { TipLinkWalletAdapter } from '@tiplink/wallet-adapter';
import { TipLinkWalletAutoConnect } from '@tiplink/wallet-adapter-react-ui';
import { TipLinkWalletAutoConnectV2 } from '@tiplink/wallet-adapter-react-ui';

import { Configurations } from "./models";
import Main from "./layout/Main";
Expand All @@ -34,13 +34,13 @@ export const App = ({ element, ...appSettings }: Props) => {
return (
<AppContext config={appSettings} element={element}>
<ConnectionProvider endpoint={endpoint}>
<TipLinkWalletAutoConnect isReady query={searchParams}>
<TipLinkWalletAutoConnectV2 isReady query={searchParams}>
<WalletProvider wallets={wallets} autoConnect>
<WalletModalProvider>
<Main />
</WalletModalProvider>
</WalletProvider>
</TipLinkWalletAutoConnect>
</TipLinkWalletAutoConnectV2>
</ConnectionProvider>
</AppContext>
);
Expand Down
29 changes: 21 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,11 @@
resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==

"@interactjs/[email protected]":
version "1.10.27"
resolved "https://registry.yarnpkg.com/@interactjs/types/-/types-1.10.27.tgz#10afd71cef2498e2b5192cf0d46f937d8ceb767f"
integrity sha512-BUdv0cvs4H5ODuwft2Xp4eL8Vmi3LcihK42z0Ft/FbVJZoRioBsxH+LlsBdK4tAie7PqlKGy+1oyOncu1nQ6eA==

"@isaacs/cliui@^8.0.2":
version "8.0.2"
resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
Expand Down Expand Up @@ -2153,19 +2158,19 @@
resolved "https://registry.yarnpkg.com/@supercharge/promise-pool/-/promise-pool-3.2.0.tgz#a6ab4afdf798e453a6bb51c4ae340852e1266af8"
integrity sha512-pj0cAALblTZBPtMltWOlZTQSLT07jIaFNeM8TWoJD1cQMgDB9mcMlVMoetiB35OzNJpqQ2b+QEtwiR9f20mADg==

"@tiplink/wallet-adapter-react-ui@^0.1.11":
version "0.1.12"
resolved "https://registry.yarnpkg.com/@tiplink/wallet-adapter-react-ui/-/wallet-adapter-react-ui-0.1.12.tgz#03882ee8422ffb32842dc8e2187c489603e14546"
integrity sha512-jMFuf3kLtUJ/TjeiezIl5peMg8wYooiZyMK7QulY4jqgI6Z4PV/JS+lnB8usqfJP8U3QFZ4oYljIcj/YSzHZLw==
"@tiplink/wallet-adapter-react-ui@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@tiplink/wallet-adapter-react-ui/-/wallet-adapter-react-ui-1.0.0.tgz#dbf019b80374cf669c4e2ace965b541cd98bee61"
integrity sha512-L73QunW0bjT23T7aBkV9FDuvd4xbWP+ABO5dDPkDapx+yf9w4duHfzyvfcmsdtc+dNiIdPw5Rf6kJQIsY4ZRuA==
dependencies:
"@solana/wallet-adapter-base" "^0.9.23"
"@solana/wallet-adapter-base-ui" "^0.1.2"
"@solana/wallet-adapter-react" "^0.15.35"

"@tiplink/wallet-adapter@^2.1.16":
version "2.1.17"
resolved "https://registry.yarnpkg.com/@tiplink/wallet-adapter/-/wallet-adapter-2.1.17.tgz#106e53117b7b9c2066973d6f4c37565613cf7d1f"
integrity sha512-H1Lj8Gk742b3ccpW5uwn8KQdeKEOpSr7HFlD0YVwhc2mVEkNg04wZ7qVJly2Nu0YG7Z1ui1Qhlqe8Eks4fNAaA==
"@tiplink/wallet-adapter@^2.1.18":
version "2.1.18"
resolved "https://registry.yarnpkg.com/@tiplink/wallet-adapter/-/wallet-adapter-2.1.18.tgz#bb57ca8577edd52f91b6a6006df794ab96b7ea5d"
integrity sha512-G/ukP10KOKYtGhYbvN7IyvD+rvatYH19hD8MJP/03g+ZYht7VJZfDuLj5g8UW0FEyt4MFIIiCIT+dmXmX/+fcg==
dependencies:
"@sentry/types" "^7.46.0"
"@solana/wallet-adapter-base" "^0.9.23"
Expand All @@ -2175,6 +2180,7 @@
bs58 "^4.0.1"
crypto-browserify "^3.12.0"
fast-deep-equal "^3.1.3"
interactjs "^1.10.27"
process "^0.11.10"
pump "^3.0.0"
stream-browserify "^3.0.0"
Expand Down Expand Up @@ -5165,6 +5171,13 @@ inspectpack@^4.7.1:
semver-compare "^1.0.0"
yargs "^16.2.0"

interactjs@^1.10.27:
version "1.10.27"
resolved "https://registry.yarnpkg.com/interactjs/-/interactjs-1.10.27.tgz#16499aba4987a5ccfdaddca7d1ba7bb1118e14d0"
integrity sha512-y/8RcCftGAF24gSp76X2JS3XpHiUvDQyhF8i7ujemBz77hwiHDuJzftHx7thY8cxGogwGiPJ+o97kWB6eAXnsA==
dependencies:
"@interactjs/types" "1.10.27"

internal-slot@^1.0.3:
version "1.0.3"
resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"
Expand Down

0 comments on commit 87b7419

Please sign in to comment.