-
-
- copyToClipboard()}
- customClass={`hover-text cursor-pointer`}
- />
- }
- customClass={`${classes.depositInput} my-3`}
- readOnly={true}
- type="text"
- customRef={addressRef}
- value={address.address}
- />
-
-
- { (id === "TETH" || id === "TUSDT" || id === "TBTC") && helpText() }
+
+
{
+ return {value: index, label: `${chain.network} - ${chain.currency}`}
+ })}
+ lead={t('DepositWithdraw.network')}
+ type="select"
+ value={currencyInfo?.chains[networkName.value] && {
+ value: networkName.value,
+ label: `${currencyInfo?.chains[networkName.value].network} - ${currencyInfo?.chains[networkName.value].currency}`
+ }}
+ onchange={(e) => setNetworkName({value: e?.value || 0, error: []})}
+ customRef={selectRef}
+ alerts={networkName.error}
+ customClass={`width-100 ${classes.thisInput}`}
+ />
+ { currencyInfo && }
);
};
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/Deposit.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/Deposit.module.css
index 5307d94..29cb34c 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/Deposit.module.css
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/Deposit.module.css
@@ -9,4 +9,12 @@
width: 85% !important;
cursor: not-allowed;
font-family: 'Roboto', sans-serif;
+}
+
+
+.thisInput :global(.lead) {
+ width: 25%;
+}
+.thisInput :global(.select) {
+ width: 75% !important;
}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/components/Address/Address.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/components/Address/Address.js
new file mode 100644
index 0000000..3ef19a2
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/components/Address/Address.js
@@ -0,0 +1,69 @@
+import React, {useEffect, useRef} from 'react';
+import classes from "../../Deposit.module.css";
+import {useParams} from "react-router-dom";
+import {Trans, useTranslation} from "react-i18next";
+import {useGetDepositAddress} from "../../../../../../../../../../../../queries";
+import {toast} from "react-hot-toast";
+import TextInput from "../../../../../../../../../../../../components/TextInput/TextInput";
+import Icon from "../../../../../../../../../../../../components/Icon/Icon";
+import QRCode from "react-qr-code";
+
+const Address = ({network}) => {
+
+ const {id} = useParams();
+ const {t} = useTranslation();
+ const addressRef = useRef(null);
+
+ const copyToClipboard = () => {
+ addressRef.current.select();
+ document.execCommand("copy");
+ toast.success(
);
+ };
+
+ const {data: address, isLoading, error, refetch: refetchAddress} = useGetDepositAddress(id, network)
+
+ useEffect(() => {
+ if (id !== "IRT") {
+ refetchAddress()
+ }
+ }, [network]);
+
+ if (isLoading) return
{t('DepositWithdraw.gettingAddress')}
+ if (error) return
{t('DepositWithdraw.errorGettingAddress')}
+
+
+ return (
+
+
+
copyToClipboard()}
+ customClass={`hover-text cursor-pointer`}
+ />
+ }
+ customClass={`${classes.depositInput} my-5 width-100 fs-0-8`}
+ readOnly={true}
+ type="text"
+ customRef={addressRef}
+ value={address.address}
+ />
+
+
+
+
+ );
+};
+
+export default Address;
diff --git a/src/queries/hooks/useGetDepositAddress.js b/src/queries/hooks/useGetDepositAddress.js
index bffdfcd..535b1b5 100644
--- a/src/queries/hooks/useGetDepositAddress.js
+++ b/src/queries/hooks/useGetDepositAddress.js
@@ -1,18 +1,19 @@
import {useQuery} from "@tanstack/react-query";
import {getDepositAddress} from "js-api-client";
-export const useGetDepositAddress = (currency) => {
+export const useGetDepositAddress = (currency, network) => {
+
return useQuery(
- ['depositAddress', currency],
- () => getDepositAddressFunc(currency),
+ ['depositAddress', currency, network],
+ () => getDepositAddressFunc(currency, network),
{
retry: 1,
refetchOnMount: false,
- staleTime: 30*60*1000
+ staleTime: 30*60*1000,
});
}
-const getDepositAddressFunc = async (currency) => {
- const {data} = await getDepositAddress(currency)
+const getDepositAddressFunc = async (currency, network) => {
+ const {data} = await getDepositAddress(currency, network)
return data;
}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index e02fc94..918cb99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3245,6 +3245,11 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+base64-js@^1.3.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+ integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
batch@0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -3367,6 +3372,14 @@ buffer-from@^1.0.0:
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+buffer@^6.0.3:
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+ integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+ dependencies:
+ base64-js "^1.3.1"
+ ieee754 "^1.2.1"
+
builtin-modules@^3.1.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
@@ -5540,6 +5553,11 @@ identity-obj-proxy@^3.0.0:
dependencies:
harmony-reflect "^1.4.6"
+ieee754@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+ integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
ignore@^5.2.0:
version "5.2.4"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
@@ -6478,7 +6496,7 @@ jiti@^1.17.2:
"js-api-client@https://github.com/opexdev/js-api-client.git#develop":
version "1.0.0-beta2"
- resolved "https://github.com/opexdev/js-api-client.git#e61b9acc9419447f365a82965b40bf69cbad72dd"
+ resolved "https://github.com/opexdev/js-api-client.git#c185b3b2b61c2655592b4d31276473bed5b47a25"
js-sdsl@^4.1.4:
version "4.4.0"
}
return (
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/Deposit.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/Deposit.js
index dbe4eaa..428b6bf 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/Deposit.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/Deposit/Deposit.js
@@ -1,129 +1,42 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
import classes from './Deposit.module.css'
import QRCode from "react-qr-code";
import {Trans, useTranslation} from "react-i18next";
import TextInput from "../../../../../../../../../../components/TextInput/TextInput";
import {useParams} from "react-router-dom";
-import {useGetDepositAddress} from "../../../../../../../../../../queries";
+import {useGetCurrencyInfo, useGetDepositAddress} from "../../../../../../../../../../queries";
import {toast} from "react-hot-toast";
import Loading from "../../../../../../../../../../components/Loading/Loading";
import Error from "../../../../../../../../../../components/Error/Error";
import Icon from "../../../../../../../../../../components/Icon/Icon";
+import Address from "./components/Address/Address";
const Deposit = () => {
const {id} = useParams();
const {t} = useTranslation();
- const addressRef = useRef(null);
useEffect(() => {
toast.dismiss()
}, [])
- const copyToClipboard = () => {
- addressRef.current.select();
- document.execCommand("copy");
- toast.success(