From e20dea097dcdf07393e21bb29f11dce6052b81a5 Mon Sep 17 00:00:00 2001 From: "razvan.tomegea" Date: Wed, 4 Sep 2024 14:20:21 +0300 Subject: [PATCH 1/5] Removed gateway from network switch --- src/config/config.devnet.ts | 12 ------------ src/config/config.mainnet.ts | 12 ------------ src/config/config.sovereign.ts | 12 ------------ src/config/config.testnet.ts | 12 ------------ 4 files changed, 48 deletions(-) diff --git a/src/config/config.devnet.ts b/src/config/config.devnet.ts index 697b604b..9a9b22e6 100644 --- a/src/config/config.devnet.ts +++ b/src/config/config.devnet.ts @@ -16,18 +16,6 @@ export const networks: NetworkType[] = [ walletAddress: 'https://devnet-wallet.multiversx.com', WEGLDid: '' }, - { - default: false, - id: EnvironmentsEnum.devnet, - name: 'Gateway', - apiAddress: '', - gatewayUrl: 'https://devnet-gateway.multiversx.com', - extrasApi: 'https://devnet-extras-api.multiversx.com', - sampleAuthenticatedDomains: [''], - sovereignContractAddress: '', - walletAddress: 'https://devnet-wallet.multiversx.com', - WEGLDid: '' - }, { default: false, id: EnvironmentsEnum.mainnet, diff --git a/src/config/config.mainnet.ts b/src/config/config.mainnet.ts index 81d8952c..33cdfbbc 100644 --- a/src/config/config.mainnet.ts +++ b/src/config/config.mainnet.ts @@ -16,18 +16,6 @@ export const networks: NetworkType[] = [ walletAddress: 'https://devnet-wallet.multiversx.com', WEGLDid: '' }, - { - default: false, - id: EnvironmentsEnum.devnet, - name: 'Gateway', - apiAddress: '', - gatewayUrl: 'https://devnet-gateway.multiversx.com', - extrasApi: 'https://devnet-extras-api.multiversx.com', - sampleAuthenticatedDomains: [''], - sovereignContractAddress: '', - walletAddress: 'https://devnet-wallet.multiversx.com', - WEGLDid: '' - }, { default: true, id: EnvironmentsEnum.mainnet, diff --git a/src/config/config.sovereign.ts b/src/config/config.sovereign.ts index d9ee6b5f..970b6cc9 100644 --- a/src/config/config.sovereign.ts +++ b/src/config/config.sovereign.ts @@ -16,18 +16,6 @@ export const networks: NetworkType[] = [ walletAddress: 'https://devnet-wallet.multiversx.com', WEGLDid: '' }, - { - default: false, - id: EnvironmentsEnum.devnet, - name: 'Gateway', - apiAddress: '', - gatewayUrl: 'https://devnet-gateway.multiversx.com', - extrasApi: 'https://devnet-extras-api.multiversx.com', - sampleAuthenticatedDomains: [''], - sovereignContractAddress: '', - walletAddress: 'https://devnet-wallet.multiversx.com', - WEGLDid: '' - }, { default: false, id: EnvironmentsEnum.mainnet, diff --git a/src/config/config.testnet.ts b/src/config/config.testnet.ts index 7fb6863a..f81f0b7f 100644 --- a/src/config/config.testnet.ts +++ b/src/config/config.testnet.ts @@ -16,18 +16,6 @@ export const networks: NetworkType[] = [ walletAddress: 'https://devnet-wallet.multiversx.com', WEGLDid: '' }, - { - default: false, - id: EnvironmentsEnum.devnet, - name: 'Gateway', - apiAddress: '', - gatewayUrl: 'https://devnet-gateway.multiversx.com', - extrasApi: 'https://devnet-extras-api.multiversx.com', - sampleAuthenticatedDomains: [''], - sovereignContractAddress: '', - walletAddress: 'https://devnet-wallet.multiversx.com', - WEGLDid: '' - }, { default: false, id: EnvironmentsEnum.mainnet, From 54fd62cd25471fe3429bd1c776e5c27c28c0fb31 Mon Sep 17 00:00:00 2001 From: "razvan.tomegea" Date: Wed, 4 Sep 2024 14:24:55 +0300 Subject: [PATCH 2/5] Fixed register token and issue token --- src/pages/IssueToken/hooks/useIssueTokenForm.ts | 7 ++++++- src/pages/RegisterToken/hooks/useRegisterTokenForm.ts | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pages/IssueToken/hooks/useIssueTokenForm.ts b/src/pages/IssueToken/hooks/useIssueTokenForm.ts index b6238dbf..8d843c6f 100644 --- a/src/pages/IssueToken/hooks/useIssueTokenForm.ts +++ b/src/pages/IssueToken/hooks/useIssueTokenForm.ts @@ -16,6 +16,7 @@ import { import { DECIMALS } from 'localConstants'; import { IssueTokenFieldsEnum } from '../types'; +import BigNumber from 'bignumber.js'; export const useIssueTokenForm = () => { const { address } = useGetAccount(); @@ -74,7 +75,11 @@ export const useIssueTokenForm = () => { sender: new Address(address), tokenName: values.tokenName, tokenTicker: values.tokenTicker.toUpperCase(), - initialSupply: BigInt(values.mintedValue), + initialSupply: BigInt( + new BigNumber(values.mintedValue) + .pow(10, values.numDecimals) + .toNumber() + ), numDecimals: BigInt(values.numDecimals), canFreeze: true, canWipe: true, diff --git a/src/pages/RegisterToken/hooks/useRegisterTokenForm.ts b/src/pages/RegisterToken/hooks/useRegisterTokenForm.ts index eb245c56..fa360151 100644 --- a/src/pages/RegisterToken/hooks/useRegisterTokenForm.ts +++ b/src/pages/RegisterToken/hooks/useRegisterTokenForm.ts @@ -23,8 +23,8 @@ import { getRegisterTokenTransaction } from '../helpers'; import { RegisterTokenFormFieldsEnum } from '../types'; const defaultChain = { - label: capitalize(EnvironmentsEnum.devnet), - value: DEVNET_CHAIN_ID + label: capitalize(EnvironmentsEnum.testnet), + value: TESTNET_CHAIN_ID }; const NetworkChainIdMap: Record = { @@ -43,7 +43,8 @@ export const useRegisterTokenForm = () => { const [sendType, setSendType] = useState(SendTypeEnum.esdt); const isNFT = sendType === SendTypeEnum.nft; const { tokenOptions, isLoading, tokens } = useTokenOptions({ - sendType + sendType, + skipAddEgld: true }); const refreshNativeAuthTokenForNetwork = @@ -98,7 +99,7 @@ export const useRegisterTokenForm = () => { await switchNetwork(NetworkChainIdMap[transaction.chainID]); await sleep(1000); const { nonce } = accountSelector(sdkDappStore.getState()); - transaction.setNonce(nonce + 1); + transaction.setNonce(nonce); await sendTransactions([transaction]); navigate(routeNames.dashboard); } From d2c449ba32d1a3529d1fc3e4d6077b7e97a6edea Mon Sep 17 00:00:00 2001 From: "razvan.tomegea" Date: Wed, 4 Sep 2024 14:27:41 +0300 Subject: [PATCH 3/5] Fixed Dropdown.tsx --- src/components/Dropdown/Dropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Dropdown/Dropdown.tsx b/src/components/Dropdown/Dropdown.tsx index bef30998..8cc521f1 100644 --- a/src/components/Dropdown/Dropdown.tsx +++ b/src/components/Dropdown/Dropdown.tsx @@ -59,7 +59,7 @@ export const Dropdown = ({
{options.map((option, index) => (