diff --git a/package-lock.json b/package-lock.json index f2d8d18..067540f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,12 +9,12 @@ "version": "0.1.0", "license": "GPL", "dependencies": { - "@alephium/cli": "^0.16.1", + "@alephium/cli": "^0.17.1", "@alephium/token-list": "0.0.11", - "@alephium/web3": "^0.16.1", - "@alephium/web3-react": "^0.16.1", - "@alephium/web3-test": "^0.16.1", - "@alephium/web3-wallet": "^0.16.1", + "@alephium/web3": "^0.17.1", + "@alephium/web3-react": "^0.17.1", + "@alephium/web3-test": "^0.17.1", + "@alephium/web3-wallet": "^0.17.1", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.60", @@ -82,12 +82,12 @@ } }, "node_modules/@alephium/cli": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/cli/-/cli-0.16.1.tgz", - "integrity": "sha512-khWq2ZuFqim0nQ86s3vES9oACBqVvM82gelyb06hx2/+9vIYSD+X3/s0Gri6BM4Ka566Xz8zCIZgKrK63EqQpQ==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/cli/-/cli-0.17.1.tgz", + "integrity": "sha512-awEP2AXAWD5FpGrjIsKSY9o83UqSy+3aJl81/NwG7Qkxs82FHWvdi3T6MonA6FONTh7zww9fgCCGH2WDBgCJfQ==", "dependencies": { - "@alephium/web3": "^0.16.1", - "@alephium/web3-wallet": "^0.16.1", + "@alephium/web3": "^0.17.1", + "@alephium/web3-wallet": "^0.17.1", "commander": "^9.5.0", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", @@ -116,11 +116,11 @@ } }, "node_modules/@alephium/get-extension-wallet": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/get-extension-wallet/-/get-extension-wallet-0.16.1.tgz", - "integrity": "sha512-6OqyOjQiKf4GQhURE5WsURnnDVywxmWJBRMOYqd5+j9K+lw2+CvgLj1Y0Ce2hwKOxpH/SpPYQGV4MXhmzaSEZg==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/get-extension-wallet/-/get-extension-wallet-0.17.1.tgz", + "integrity": "sha512-ZczhiaTzI0FkzI3ZG6P1/BxNxHCNHWflpvR8MLiawA5jzNvbYohAQweg3/ORcMSxh8BGbxkd2p8upu6dqaCsXA==", "dependencies": { - "@alephium/web3": "^0.16.1", + "@alephium/web3": "^0.17.1", "bowser": "^2.11.0" } }, @@ -137,12 +137,12 @@ } }, "node_modules/@alephium/walletconnect-provider": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/walletconnect-provider/-/walletconnect-provider-0.16.1.tgz", - "integrity": "sha512-PFDFPX3G8aJviwvYWlpffAbWqjJ0QX5Poyw2DW9Tinnz8CbWc/kWPBp2zJNpq7QsSMwU/hPxj67VVBe944I2Vw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/walletconnect-provider/-/walletconnect-provider-0.17.1.tgz", + "integrity": "sha512-8WAmW3uIk/Xks2jeDkbXjODJHfkC0Fq9R7om8RUZHQHI/gFwl4TbwD/NlcwKXV/x2pBLvz1aY2S4a6Cm02yULg==", "dependencies": { - "@alephium/web3": "^0.16.1", - "@alephium/web3-wallet": "^0.16.1", + "@alephium/web3": "^0.17.1", + "@alephium/web3-wallet": "^0.17.1", "@walletconnect/sign-client": "2.5.2", "@walletconnect/types": "2.5.2", "@walletconnect/utils": "2.5.2", @@ -154,9 +154,9 @@ } }, "node_modules/@alephium/web3": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/web3/-/web3-0.16.1.tgz", - "integrity": "sha512-IkFtRh3s0hsZ8wBVlMnZ+oG4vwfzU7AgWOHMlv+ZnYzTn/XcoPIV4k9RWHfSwjSNjyT7PCc665KuWsXh9sU1zw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/web3/-/web3-0.17.1.tgz", + "integrity": "sha512-Bln9EYNOTS7lRff3XcHgOeYymkvQkUVq7tQYo3W1tZZ8/43xRSuftGr0JJU1SwBOhw6dAqfxYtNaTfkIH1bCog==", "dependencies": { "@noble/secp256k1": "1.7.1", "base-x": "4.0.0", @@ -176,12 +176,12 @@ } }, "node_modules/@alephium/web3-react": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/web3-react/-/web3-react-0.16.1.tgz", - "integrity": "sha512-XU3g2LbfCn2/zSTRsaCOFV3KHYH1pdOssSqkfcRS5Pq0ys9uDKMBaTIyfN9604mw5QcGY+9Q51y2RYAn/ylcQw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/web3-react/-/web3-react-0.17.1.tgz", + "integrity": "sha512-q7ihgkxnAyV8a6P6mqTll+4QgGQUz8FKNiKkeO3S5raBtPgdfmGTbbP4pVJDsOS1WuRSSadlGjf4D8egyQ+qNA==", "dependencies": { - "@alephium/get-extension-wallet": "^0.16.1", - "@alephium/walletconnect-provider": "^0.16.1", + "@alephium/get-extension-wallet": "^0.17.1", + "@alephium/walletconnect-provider": "^0.17.1", "@walletconnect/qrcode-modal": "^1.8.0", "buffer": "^6.0.3", "detect-browser": "^5.3.0", @@ -201,12 +201,12 @@ } }, "node_modules/@alephium/web3-test": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/web3-test/-/web3-test-0.16.1.tgz", - "integrity": "sha512-NrAvhnv6JgKlYpvkxDequxtpzCL24TjdMUi2g6zjFgxshHQ3RVr64eA4664XjxM1ONMPK27Yjv9E1ZctzwuYCw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/web3-test/-/web3-test-0.17.1.tgz", + "integrity": "sha512-6JmFkWYmlnAVENHxRPn+14e6yYQmk47sdLVeAFmVzFR0zebRuFlp8i2YbQpfUeYcYFpRpzgYUMlkyrjnl7SX7Q==", "dependencies": { - "@alephium/web3": "^0.16.1", - "@alephium/web3-wallet": "^0.16.1" + "@alephium/web3": "^0.17.1", + "@alephium/web3-wallet": "^0.17.1" }, "engines": { "node": ">=16.0.0", @@ -214,11 +214,11 @@ } }, "node_modules/@alephium/web3-wallet": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/web3-wallet/-/web3-wallet-0.16.1.tgz", - "integrity": "sha512-GXfk5eUVzC5RQ2i1PToEw9eoxV4IUn9Olj/Dvi6X/QEZ8h+1/5duVcSj+3tHMDyWg4ZLHqY9KIHfKjrT5gSnDg==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/web3-wallet/-/web3-wallet-0.17.1.tgz", + "integrity": "sha512-7f7k8KNnAxJkvZPK4xomXEKVlramaj7I3IQEMuht3fZu8fT28PUkbxBi+HWFQmKxzMADf1SuDRknoaLiymkeDw==", "dependencies": { - "@alephium/web3": "^0.16.1", + "@alephium/web3": "^0.17.1", "@noble/secp256k1": "1.7.1", "@types/node": "^16.18.23", "bip32": "3.1.0", @@ -28681,12 +28681,12 @@ }, "dependencies": { "@alephium/cli": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/cli/-/cli-0.16.1.tgz", - "integrity": "sha512-khWq2ZuFqim0nQ86s3vES9oACBqVvM82gelyb06hx2/+9vIYSD+X3/s0Gri6BM4Ka566Xz8zCIZgKrK63EqQpQ==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/cli/-/cli-0.17.1.tgz", + "integrity": "sha512-awEP2AXAWD5FpGrjIsKSY9o83UqSy+3aJl81/NwG7Qkxs82FHWvdi3T6MonA6FONTh7zww9fgCCGH2WDBgCJfQ==", "requires": { - "@alephium/web3": "^0.16.1", - "@alephium/web3-wallet": "^0.16.1", + "@alephium/web3": "^0.17.1", + "@alephium/web3-wallet": "^0.17.1", "commander": "^9.5.0", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", @@ -28707,11 +28707,11 @@ } }, "@alephium/get-extension-wallet": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/get-extension-wallet/-/get-extension-wallet-0.16.1.tgz", - "integrity": "sha512-6OqyOjQiKf4GQhURE5WsURnnDVywxmWJBRMOYqd5+j9K+lw2+CvgLj1Y0Ce2hwKOxpH/SpPYQGV4MXhmzaSEZg==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/get-extension-wallet/-/get-extension-wallet-0.17.1.tgz", + "integrity": "sha512-ZczhiaTzI0FkzI3ZG6P1/BxNxHCNHWflpvR8MLiawA5jzNvbYohAQweg3/ORcMSxh8BGbxkd2p8upu6dqaCsXA==", "requires": { - "@alephium/web3": "^0.16.1", + "@alephium/web3": "^0.17.1", "bowser": "^2.11.0" } }, @@ -28724,12 +28724,12 @@ } }, "@alephium/walletconnect-provider": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/walletconnect-provider/-/walletconnect-provider-0.16.1.tgz", - "integrity": "sha512-PFDFPX3G8aJviwvYWlpffAbWqjJ0QX5Poyw2DW9Tinnz8CbWc/kWPBp2zJNpq7QsSMwU/hPxj67VVBe944I2Vw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/walletconnect-provider/-/walletconnect-provider-0.17.1.tgz", + "integrity": "sha512-8WAmW3uIk/Xks2jeDkbXjODJHfkC0Fq9R7om8RUZHQHI/gFwl4TbwD/NlcwKXV/x2pBLvz1aY2S4a6Cm02yULg==", "requires": { - "@alephium/web3": "^0.16.1", - "@alephium/web3-wallet": "^0.16.1", + "@alephium/web3": "^0.17.1", + "@alephium/web3-wallet": "^0.17.1", "@walletconnect/sign-client": "2.5.2", "@walletconnect/types": "2.5.2", "@walletconnect/utils": "2.5.2", @@ -28737,9 +28737,9 @@ } }, "@alephium/web3": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/web3/-/web3-0.16.1.tgz", - "integrity": "sha512-IkFtRh3s0hsZ8wBVlMnZ+oG4vwfzU7AgWOHMlv+ZnYzTn/XcoPIV4k9RWHfSwjSNjyT7PCc665KuWsXh9sU1zw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/web3/-/web3-0.17.1.tgz", + "integrity": "sha512-Bln9EYNOTS7lRff3XcHgOeYymkvQkUVq7tQYo3W1tZZ8/43xRSuftGr0JJU1SwBOhw6dAqfxYtNaTfkIH1bCog==", "requires": { "@noble/secp256k1": "1.7.1", "base-x": "4.0.0", @@ -28755,12 +28755,12 @@ } }, "@alephium/web3-react": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/web3-react/-/web3-react-0.16.1.tgz", - "integrity": "sha512-XU3g2LbfCn2/zSTRsaCOFV3KHYH1pdOssSqkfcRS5Pq0ys9uDKMBaTIyfN9604mw5QcGY+9Q51y2RYAn/ylcQw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/web3-react/-/web3-react-0.17.1.tgz", + "integrity": "sha512-q7ihgkxnAyV8a6P6mqTll+4QgGQUz8FKNiKkeO3S5raBtPgdfmGTbbP4pVJDsOS1WuRSSadlGjf4D8egyQ+qNA==", "requires": { - "@alephium/get-extension-wallet": "^0.16.1", - "@alephium/walletconnect-provider": "^0.16.1", + "@alephium/get-extension-wallet": "^0.17.1", + "@alephium/walletconnect-provider": "^0.17.1", "@walletconnect/qrcode-modal": "^1.8.0", "buffer": "^6.0.3", "detect-browser": "^5.3.0", @@ -28773,20 +28773,20 @@ } }, "@alephium/web3-test": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/web3-test/-/web3-test-0.16.1.tgz", - "integrity": "sha512-NrAvhnv6JgKlYpvkxDequxtpzCL24TjdMUi2g6zjFgxshHQ3RVr64eA4664XjxM1ONMPK27Yjv9E1ZctzwuYCw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/web3-test/-/web3-test-0.17.1.tgz", + "integrity": "sha512-6JmFkWYmlnAVENHxRPn+14e6yYQmk47sdLVeAFmVzFR0zebRuFlp8i2YbQpfUeYcYFpRpzgYUMlkyrjnl7SX7Q==", "requires": { - "@alephium/web3": "^0.16.1", - "@alephium/web3-wallet": "^0.16.1" + "@alephium/web3": "^0.17.1", + "@alephium/web3-wallet": "^0.17.1" } }, "@alephium/web3-wallet": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@alephium/web3-wallet/-/web3-wallet-0.16.1.tgz", - "integrity": "sha512-GXfk5eUVzC5RQ2i1PToEw9eoxV4IUn9Olj/Dvi6X/QEZ8h+1/5duVcSj+3tHMDyWg4ZLHqY9KIHfKjrT5gSnDg==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@alephium/web3-wallet/-/web3-wallet-0.17.1.tgz", + "integrity": "sha512-7f7k8KNnAxJkvZPK4xomXEKVlramaj7I3IQEMuht3fZu8fT28PUkbxBi+HWFQmKxzMADf1SuDRknoaLiymkeDw==", "requires": { - "@alephium/web3": "^0.16.1", + "@alephium/web3": "^0.17.1", "@noble/secp256k1": "1.7.1", "@types/node": "^16.18.23", "bip32": "3.1.0", diff --git a/package.json b/package.json index 93c408a..5a69cb9 100644 --- a/package.json +++ b/package.json @@ -41,11 +41,11 @@ ] }, "dependencies": { - "@alephium/cli": "^0.16.1", - "@alephium/web3": "^0.16.1", - "@alephium/web3-test": "^0.16.1", - "@alephium/web3-wallet": "^0.16.1", - "@alephium/web3-react": "^0.16.1", + "@alephium/cli": "^0.17.1", + "@alephium/web3": "^0.17.1", + "@alephium/web3-test": "^0.17.1", + "@alephium/web3-wallet": "^0.17.1", + "@alephium/web3-react": "^0.17.1", "@alephium/token-list": "0.0.11", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.11.2", diff --git a/src/components/AddLiquidity.tsx b/src/components/AddLiquidity.tsx index 69dd6de..4ba21b0 100644 --- a/src/components/AddLiquidity.tsx +++ b/src/components/AddLiquidity.tsx @@ -5,7 +5,7 @@ import ButtonWithLoader from "./ButtonWithLoader"; import TokenSelectDialog from "./TokenSelectDialog"; import NumberTextField from "./NumberTextField"; import { addLiquidity, bigIntToString, PairTokenDecimals, minimalAmount, AddLiquidityDetails, tryGetBalance } from "../utils/dex"; -import { useAlephiumWallet, useAvailableBalances } from "../hooks/useAlephiumWallet"; +import { useAvailableBalances } from "../hooks/useAvailableBalance"; import { useSlippageTolerance } from "../hooks/useSlippageTolerance"; import { useDeadline } from "../hooks/useDeadline"; import { DEFAULT_SLIPPAGE } from "../state/settings/reducer"; @@ -17,6 +17,7 @@ import { commonStyles } from "./style"; import { useHistory } from "react-router-dom"; import { TransactionSubmitted, WaitingForTxSubmission } from "./Transactions"; import { DetailItem } from "./DetailsItem"; +import { useWallet } from "@alephium/web3-react"; function AddLiquidity() { const classes = commonStyles(); @@ -26,7 +27,7 @@ function AddLiquidity() { const [deadline,] = useDeadline() const dispatch = useDispatch() const [error, setError] = useState(undefined) - const wallet = useAlephiumWallet() + const wallet = useWallet() const { balance, updateBalanceForTx } = useAvailableBalances() const history = useHistory() @@ -134,7 +135,7 @@ function AddLiquidity() { balance, wallet.signer, wallet.signer.explorerProvider, - wallet.address, + wallet.account.address, tokenPairState, tokenAInfo, tokenBInfo, diff --git a/src/components/AddPool.tsx b/src/components/AddPool.tsx index 95962fa..d64075d 100644 --- a/src/components/AddPool.tsx +++ b/src/components/AddPool.tsx @@ -4,11 +4,12 @@ import { TokenInfo } from "@alephium/token-list" import { useCallback, useEffect, useMemo, useState } from "react"; import ButtonWithLoader from "./ButtonWithLoader"; import { tokenPairExist, createTokenPair } from "../utils/dex"; -import { useAlephiumWallet, useAvailableBalances } from "../hooks/useAlephiumWallet"; +import { useAvailableBalances } from "../hooks/useAvailableBalance"; import { commonStyles } from "./style"; import TokenSelectDialog from "./TokenSelectDialog"; import { useHistory } from "react-router-dom"; import { TransactionSubmitted, WaitingForTxSubmission } from "./Transactions"; +import { useWallet } from "@alephium/web3-react"; function AddPool() { const commonClasses = commonStyles(); @@ -17,13 +18,13 @@ function AddPool() { const [txId, setTxId] = useState(undefined) const [addingPool, setAddingPool] = useState(false) const [error, setError] = useState(undefined) - const wallet = useAlephiumWallet() + const wallet = useWallet() const { balance, updateBalanceForTx } = useAvailableBalances() const history = useHistory() useEffect(() => { async function checkContractExist() { - if (tokenAInfo !== undefined && tokenBInfo !== undefined && wallet !== undefined) { + if (tokenAInfo !== undefined && tokenBInfo !== undefined && wallet !== undefined && wallet.nodeProvider !== undefined) { try { const exist = await tokenPairExist(wallet.nodeProvider, tokenAInfo.id, tokenBInfo.id) if (exist) setError(`token pair already exist`) @@ -82,7 +83,7 @@ function AddPool() { const result = await createTokenPair( wallet.signer, wallet.signer.explorerProvider, - wallet.address, + wallet.account.address, tokenAInfo.id, tokenBInfo.id ) diff --git a/src/components/Pools.tsx b/src/components/Pools.tsx index bbdf792..8170324 100644 --- a/src/components/Pools.tsx +++ b/src/components/Pools.tsx @@ -6,16 +6,17 @@ import { commonStyles } from "./style"; import { TokenInfo } from "@alephium/token-list"; import { useTokenPairState } from "../state/useTokenPairState"; import TokenSelectDialog from "./TokenSelectDialog"; -import { useAlephiumWallet, useAvailableBalances } from "../hooks/useAlephiumWallet"; +import { useAvailableBalances } from "../hooks/useAvailableBalance"; import { DetailItem } from "./DetailsItem"; import BigNumber from "bignumber.js"; +import { useWallet } from "@alephium/web3-react"; function Pool() { const commonClasses = commonStyles() const [tokenAInfo, setTokenAInfo] = useState(undefined) const [tokenBInfo, setTokenBInfo] = useState(undefined) const { tokenPairState, getTokenPairStateError } = useTokenPairState(tokenAInfo, tokenBInfo) - const wallet = useAlephiumWallet() + const wallet = useWallet() const { balance } = useAvailableBalances() const handleTokenAChange = useCallback((tokenInfo) => { diff --git a/src/components/RemoveLiquidity.tsx b/src/components/RemoveLiquidity.tsx index ea4a4f0..2496e28 100644 --- a/src/components/RemoveLiquidity.tsx +++ b/src/components/RemoveLiquidity.tsx @@ -14,7 +14,7 @@ import { bigIntToString } from "../utils/dex"; import { formatUnits } from "ethers/lib/utils"; -import { useAlephiumWallet, useAvailableBalances } from "../hooks/useAlephiumWallet"; +import { useAvailableBalances } from "../hooks/useAvailableBalance"; import { useSlippageTolerance } from "../hooks/useSlippageTolerance"; import { useDeadline } from "../hooks/useDeadline"; import { DEFAULT_SLIPPAGE } from "../state/settings/reducer"; @@ -23,6 +23,7 @@ import { useTokenPairState } from "../state/useTokenPairState"; import { TransactionSubmitted, WaitingForTxSubmission } from "./Transactions"; import { DetailItem } from "./DetailsItem"; import { useHistory } from "react-router-dom"; +import { useWallet } from "@alephium/web3-react"; function RemoveLiquidity() { const classes = commonStyles(); @@ -37,7 +38,7 @@ function RemoveLiquidity() { const [slippage,] = useSlippageTolerance() const [deadline,] = useDeadline() const [error, setError] = useState(undefined) - const wallet = useAlephiumWallet() + const wallet = useWallet() const { balance: availableBalance, updateBalanceForTx } = useAvailableBalances() const history = useHistory() @@ -163,7 +164,7 @@ function RemoveLiquidity() { const result = await removeLiquidity( wallet.signer, wallet.signer.explorerProvider, - wallet.address, + wallet.account.address, tokenPairState, amount, removeLiquidityDetails.amount0, diff --git a/src/components/Swap.tsx b/src/components/Swap.tsx index faa7d02..da8062c 100644 --- a/src/components/Swap.tsx +++ b/src/components/Swap.tsx @@ -6,7 +6,7 @@ import TokenSelectDialog from "./TokenSelectDialog"; import HoverIcon from "./HoverIcon"; import NumberTextField from "./NumberTextField"; import { bigIntToString, getSwapDetails, swap, SwapDetails, tryGetBalance } from "../utils/dex"; -import { useAlephiumWallet, useAvailableBalances } from "../hooks/useAlephiumWallet"; +import { useAvailableBalances } from "../hooks/useAvailableBalance"; import { useDeadline } from "../hooks/useDeadline"; import { useSlippageTolerance } from "../hooks/useSlippageTolerance"; import { DEFAULT_SLIPPAGE } from "../state/settings/reducer"; @@ -18,6 +18,7 @@ import { commonStyles } from "./style"; import { TransactionSubmitted, WaitingForTxSubmission } from "./Transactions"; import BigNumber from "bignumber.js"; import { DetailItem } from "./DetailsItem"; +import { useWallet } from "@alephium/web3-react"; function Swap() { const classes = commonStyles(); @@ -27,7 +28,7 @@ function Swap() { const [error, setError] = useState(undefined) const [slippage,] = useSlippageTolerance() const [deadline,] = useDeadline() - const wallet = useAlephiumWallet() + const wallet = useWallet() const { balance, updateBalanceForTx } = useAvailableBalances() const handleTokenInChange = useCallback((tokenInfo) => { @@ -144,7 +145,7 @@ function Swap() { balance, wallet.signer, wallet.signer.explorerProvider, - wallet.address, + wallet.account.address, deadline ) console.log(`swap tx submitted, tx id: ${result.txId}`) diff --git a/src/hooks/useAlephiumWallet.ts b/src/hooks/useAvailableBalance.ts similarity index 50% rename from src/hooks/useAlephiumWallet.ts rename to src/hooks/useAvailableBalance.ts index 36a5116..9c6298a 100644 --- a/src/hooks/useAlephiumWallet.ts +++ b/src/hooks/useAvailableBalance.ts @@ -1,33 +1,6 @@ -import { SignerProvider, Address, web3, ALPH_TOKEN_ID, node, NodeProvider } from '@alephium/web3' +import { ALPH_TOKEN_ID, node } from '@alephium/web3' import { useMemo } from 'react' -import { useAlephiumConnectContext, useBalance } from "@alephium/web3-react" - -export interface AlephiumWallet { - signer: SignerProvider - address: Address - group: number - nodeProvider: NodeProvider -} - -export function useAlephiumWallet() { - const context = useAlephiumConnectContext(); - - return useMemo(() => { - if (context.signerProvider?.nodeProvider === undefined) { - return undefined; - } - web3.setCurrentNodeProvider(context.signerProvider.nodeProvider); - if (context.account !== undefined) { - return { - signer: context.signerProvider, - address: context.account.address, - group: context.account.group, - nodeProvider: context.signerProvider.nodeProvider - } - } - return undefined; - }, [context.signerProvider, context.account]); -} +import { useBalance } from "@alephium/web3-react" export function useAvailableBalances() { const { balance, updateBalanceForTx } = useBalance() diff --git a/src/views/Home.tsx b/src/views/Home.tsx index 5d24158..d2c1200 100644 --- a/src/views/Home.tsx +++ b/src/views/Home.tsx @@ -6,11 +6,13 @@ import AddLiquidity from "../components/AddLiquidity"; import RemoveLiquidity from "../components/RemoveLiquidity"; import AddPool from "../components/AddPool"; import Pool from "../components/Pools"; -import { AlephiumConnectButton } from "@alephium/web3-react"; +import { AlephiumConnectButton, useWallet } from "@alephium/web3-react"; import TransactionSettings from "../components/Settings"; import { useDispatch } from "react-redux" import { reset as resetSwapState } from "../state/swap/actions"; import { reset as resetMintState } from "../state/mint/actions"; +import { useEffect } from "react"; +import { web3 } from "@alephium/web3"; const useStyles = makeStyles((theme) => ({ spacer: { @@ -49,6 +51,13 @@ const useStyles = makeStyles((theme) => ({ function Home() { const classes = useStyles(); const dispatch = useDispatch() + const wallet = useWallet() + + useEffect(() => { + if (wallet?.nodeProvider !== undefined) { + web3.setCurrentNodeProvider(wallet.nodeProvider) + } + }, [wallet?.nodeProvider]) return (