-
{transaction.hash}
-
+
-
{transaction.receiver}
-
+
-
diff --git a/src/components/OutputContainer/components/TransactionsOutput.tsx b/src/components/OutputContainer/components/TransactionsOutput.tsx
index a21c6e81..03f576f3 100644
--- a/src/components/OutputContainer/components/TransactionsOutput.tsx
+++ b/src/components/OutputContainer/components/TransactionsOutput.tsx
@@ -10,10 +10,7 @@ export const TransactionsOutput = ({
{transactions?.map((transaction) => {
return (
-
+
);
})}
diff --git a/src/components/TransactionsTable/TransactionsTable.tsx b/src/components/TransactionsTable/TransactionsTable.tsx
new file mode 100644
index 00000000..de1c5d50
--- /dev/null
+++ b/src/components/TransactionsTable/TransactionsTable.tsx
@@ -0,0 +1,41 @@
+import { useEffect, useState } from 'react';
+import {
+ MvxTransactionsTable,
+ ServerTransactionType,
+ TransactionsRowType,
+ TransactionsTableController,
+ useGetAccount,
+ useGetNetworkConfig
+} from 'lib';
+
+interface TransactionsTablePropsType {
+ transactions?: ServerTransactionType[];
+}
+
+export const TransactionsTable = ({
+ transactions = []
+}: TransactionsTablePropsType) => {
+ const { address } = useGetAccount();
+ const { network } = useGetNetworkConfig();
+ const [processedTransaction, setProcessedTransactions] = useState<
+ TransactionsRowType[]
+ >([]);
+
+ useEffect(() => {
+ processTransactions();
+ }, []);
+
+ const processTransactions = async () => {
+ const transactionsData =
+ await TransactionsTableController.processTransactions({
+ address,
+ egldLabel: network.egldLabel,
+ explorerAddress: network.explorerAddress,
+ transactions
+ });
+
+ setProcessedTransactions(transactionsData);
+ };
+
+ return
;
+};
diff --git a/src/components/TransactionsTable/index.ts b/src/components/TransactionsTable/index.ts
new file mode 100644
index 00000000..41036d18
--- /dev/null
+++ b/src/components/TransactionsTable/index.ts
@@ -0,0 +1 @@
+export * from './TransactionsTable';
diff --git a/src/components/TransactionsTracker/TransactionsTracker.ts b/src/components/TransactionsTracker/TransactionsTracker.ts
deleted file mode 100644
index 081e94de..00000000
--- a/src/components/TransactionsTracker/TransactionsTracker.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useBatchTransactionsTracker, useTransactionsTracker } from 'lib';
-
-export const TransactionsTracker = () => {
- useTransactionsTracker({
- onSuccess: (sessionId: string) => {
- console.log(`Session ${sessionId} successfully completed`);
- },
- onFail: (sessionId: string, errorMessage?: string) => {
- if (errorMessage) {
- console.log(`Session ${sessionId} failed, ${errorMessage}`);
- return;
- }
-
- console.log(`Session ${sessionId} failed`);
- }
- });
- // We do this in order to have full control of the implementation
- // Default tracker sends signedTransactions automatically and we don't want to do that
- // By doing this it will enable the tracker but without the sendTransactions logic
- useBatchTransactionsTracker({
- onSuccess: (sessionId) => {
- console.log(`Batch with session ${sessionId} successfully completed`);
- },
- onFail: (sessionId, errorMessage) => {
- if (errorMessage) {
- console.log(`Batch with session ${sessionId} failed, ${errorMessage}`);
- return;
- }
-
- console.log(`Batch with session ${sessionId} failed`);
- }
- });
-
- return null;
-};
diff --git a/src/components/TransactionsTracker/index.ts b/src/components/TransactionsTracker/index.ts
deleted file mode 100644
index 4e1911f7..00000000
--- a/src/components/TransactionsTracker/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './TransactionsTracker';
diff --git a/src/components/index.ts b/src/components/index.ts
index ad6b41fd..de768795 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -3,7 +3,8 @@ export * from './Card';
export * from './ContractAddress';
export * from './Label';
export * from './Layout';
+export * from './Loader';
export * from './MissingNativeAuthError';
export * from './MxLink';
export * from './OutputContainer';
-export * from './TransactionsTracker';
+export * from './TransactionsTable';
diff --git a/src/helpers/signAndSendTransactions.ts b/src/helpers/signAndSendTransactions.ts
index 4dc48f14..d272d77a 100644
--- a/src/helpers/signAndSendTransactions.ts
+++ b/src/helpers/signAndSendTransactions.ts
@@ -1,29 +1,26 @@
-import { refreshAccount, sendTransactions } from 'lib';
-import { isSafari } from 'localConstants';
-import { Transaction, TransactionsDisplayInfoType } from 'types';
+import {
+ getAccountProvider,
+ Transaction,
+ TransactionManager,
+ TransactionsDisplayInfoType
+} from 'lib';
type SignAndSendTransactionsProps = {
transactions: Transaction[];
- callbackRoute: string;
- transactionsDisplayInfo: TransactionsDisplayInfoType;
+ transactionsDisplayInfo?: TransactionsDisplayInfoType;
};
export const signAndSendTransactions = async ({
transactions,
- callbackRoute,
transactionsDisplayInfo
}: SignAndSendTransactionsProps) => {
- await refreshAccount();
+ const provider = getAccountProvider();
+ const txManager = TransactionManager.getInstance();
- const { sessionId } = await sendTransactions({
- transactions,
- transactionsDisplayInfo,
- redirectAfterSign: false,
- callbackRoute,
- // NOTE: performing async calls (eg: `await refreshAccount()`) before opening a new tab
- // can cause the new tab to be blocked by Safari's popup blocker.
- // To support this feature, we can set `hasConsentPopup` to `true`
- hasConsentPopup: isSafari
+ const signedTransactions = await provider.signTransactions(transactions);
+ const sentTransactions = await txManager.send(signedTransactions);
+ const sessionId = await txManager.track(sentTransactions, {
+ transactionsDisplayInfo
});
return sessionId;
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index d57e8f41..4ba6c2eb 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -1,4 +1,2 @@
export * from './transactions';
-export * from './useIsWebProvider';
-export * from './useScrollToElement';
export * from './useWindowSize';
diff --git a/src/hooks/transactions/useSendPingPongTransaction.ts b/src/hooks/transactions/useSendPingPongTransaction.ts
index dcb87fb8..50905c69 100644
--- a/src/hooks/transactions/useSendPingPongTransaction.ts
+++ b/src/hooks/transactions/useSendPingPongTransaction.ts
@@ -1,34 +1,16 @@
-import {
- AbiRegistry,
- SmartContractTransactionsFactory,
- TransactionsFactoryConfig
-} from '@multiversx/sdk-core/out';
-import { useCallback, useState } from 'react';
+import axios from 'axios';
import { contractAddress } from 'config';
-import pingPongAbi from 'contracts/ping-pong.abi.json';
-import { signAndSendTransactions } from 'helpers/signAndSendTransactions';
+import { signAndSendTransactions } from 'helpers';
import {
+ AbiRegistry,
Address,
- deleteTransactionToast,
GAS_PRICE,
- newTransaction,
- removeAllSignedTransactions,
- removeAllTransactionsToSign,
- useGetAccountInfo,
- useGetNetworkConfig,
- useTrackTransactionStatus,
- VERSION
+ SmartContractTransactionsFactory,
+ Transaction,
+ TransactionsFactoryConfig,
+ useGetAccount,
+ useGetNetworkConfig
} from 'lib';
-import { SessionEnum } from 'localConstants';
-import {
- PingPongServiceProps,
- PingRawProps,
- PongRawProps
-} from 'types/pingPong.types';
-
-type PingPongTransactionProps = {
- type: SessionEnum;
-};
const PING_TRANSACTION_INFO = {
processingMessage: 'Processing Ping transaction',
@@ -42,59 +24,13 @@ const PONG_TRANSACTION_INFO = {
successMessage: 'Pong transaction successful'
};
-export const useSendPingPongTransaction = ({
- type
-}: PingPongTransactionProps) => {
- // Needed in order to differentiate widgets between each other
- // By default sdk-dapp takes the last sessionId available which will display on every widget the same transaction
- // this usually appears on page refreshes
- const [pingPongSessionId, setPingPongSessionId] = useState(
- sessionStorage.getItem(type)
- );
-
+export const useSendPingPongTransaction = () => {
const { network } = useGetNetworkConfig();
- const { address, account } = useGetAccountInfo();
-
- const transactionStatus = useTrackTransactionStatus({
- transactionId: pingPongSessionId ?? '0'
- });
-
- const clearAllTransactions = () => {
- removeAllSignedTransactions();
- removeAllTransactionsToSign();
- deleteTransactionToast(pingPongSessionId ?? '');
- };
-
- const sendPingTransaction = useCallback(
- async ({ amount, callbackRoute }: PingRawProps) => {
- clearAllTransactions();
-
- const pingTransaction = newTransaction({
- value: amount,
- data: 'ping',
- receiver: contractAddress,
- gasLimit: 60000000,
- gasPrice: GAS_PRICE,
- chainID: network.chainId,
- nonce: account.nonce,
- sender: address,
- version: VERSION
- });
-
- const sessionId = await signAndSendTransactions({
- transactions: [pingTransaction],
- callbackRoute,
- transactionsDisplayInfo: PING_TRANSACTION_INFO
- });
-
- sessionStorage.setItem(type, sessionId);
- setPingPongSessionId(sessionId);
- },
- []
- );
+ const { address } = useGetAccount();
const getSmartContractFactory = async () => {
- const abi = AbiRegistry.create(pingPongAbi);
+ const response = await axios.get('src/contracts/ping-pong.abi.json');
+ const abi = AbiRegistry.create(response.data);
const scFactory = new SmartContractTransactionsFactory({
config: new TransactionsFactoryConfig({
chainID: network.chainId
@@ -105,119 +41,101 @@ export const useSendPingPongTransaction = ({
return scFactory;
};
- const sendPingTransactionFromAbi = useCallback(
- async ({ amount, callbackRoute }: PingRawProps) => {
- clearAllTransactions();
-
- const scFactory = await getSmartContractFactory();
- const pingTransaction = scFactory.createTransactionForExecute(
- new Address(address),
- {
- gasLimit: BigInt(60000000),
- function: 'ping',
- contract: new Address(contractAddress),
- nativeTransferAmount: BigInt(amount)
- }
- );
-
- const sessionId = await signAndSendTransactions({
- transactions: [pingTransaction],
- callbackRoute,
- transactionsDisplayInfo: PING_TRANSACTION_INFO
- });
-
- sessionStorage.setItem(type, sessionId);
- setPingPongSessionId(sessionId);
- },
- []
- );
-
- const sendPingTransactionFromService = useCallback(
- async ({ transactions, callbackRoute }: PingPongServiceProps) => {
- clearAllTransactions();
-
- const sessionId = await signAndSendTransactions({
- transactions,
- callbackRoute,
- transactionsDisplayInfo: PING_TRANSACTION_INFO
- });
-
- sessionStorage.setItem(type, sessionId);
- setPingPongSessionId(sessionId);
- },
- []
- );
-
- const sendPongTransaction = useCallback(
- async ({ callbackRoute }: PongRawProps) => {
- clearAllTransactions();
-
- const pongTransaction = newTransaction({
- value: '0',
- data: 'pong',
- receiver: contractAddress,
- gasLimit: 60000000,
- gasPrice: GAS_PRICE,
- chainID: network.chainId,
- nonce: account.nonce,
- sender: address,
- version: VERSION
- });
-
- const sessionId = await signAndSendTransactions({
- transactions: [pongTransaction],
- callbackRoute,
- transactionsDisplayInfo: PONG_TRANSACTION_INFO
- });
-
- sessionStorage.setItem(type, sessionId);
- setPingPongSessionId(sessionId);
- },
- []
- );
-
- const sendPongTransactionFromAbi = useCallback(
- async ({ callbackRoute }: PongRawProps) => {
- clearAllTransactions();
-
- const scFactory = await getSmartContractFactory();
- const pongTransaction = scFactory.createTransactionForExecute(
- new Address(address),
- {
- gasLimit: BigInt(60000000),
- function: 'pong',
- contract: new Address(contractAddress),
- nativeTransferAmount: BigInt(0)
- }
- );
-
- const sessionId = await signAndSendTransactions({
- transactions: [pongTransaction],
- callbackRoute,
- transactionsDisplayInfo: PONG_TRANSACTION_INFO
- });
-
- sessionStorage.setItem(type, sessionId);
- setPingPongSessionId(sessionId);
- },
- []
- );
-
- const sendPongTransactionFromService = useCallback(
- async ({ transactions, callbackRoute }: PingPongServiceProps) => {
- clearAllTransactions();
-
- const sessionId = await signAndSendTransactions({
- transactions,
- callbackRoute,
- transactionsDisplayInfo: PONG_TRANSACTION_INFO
- });
-
- sessionStorage.setItem(type, sessionId);
- setPingPongSessionId(sessionId);
- },
- []
- );
+ const sendPingTransaction = async (amount: string) => {
+ const pingTransaction = new Transaction({
+ value: BigInt(amount),
+ data: Buffer.from('ping'),
+ receiver: new Address(contractAddress),
+ gasLimit: BigInt(6000000),
+ gasPrice: BigInt(GAS_PRICE),
+ chainID: network.chainId,
+ sender: new Address(address),
+ version: 1
+ });
+
+ await signAndSendTransactions({
+ transactions: [pingTransaction],
+ transactionsDisplayInfo: PING_TRANSACTION_INFO
+ });
+ };
+
+ const sendPingTransactionFromAbi = async (amount: string) => {
+ const scFactory = await getSmartContractFactory();
+ const pingTransaction = scFactory.createTransactionForExecute(
+ new Address(address),
+ {
+ gasLimit: BigInt(6000000),
+ function: 'ping',
+ contract: new Address(contractAddress),
+ nativeTransferAmount: BigInt(amount)
+ }
+ );
+
+ const sessionId = await signAndSendTransactions({
+ transactions: [pingTransaction],
+ transactionsDisplayInfo: PING_TRANSACTION_INFO
+ });
+
+ return sessionId;
+ };
+
+ const sendPingTransactionFromService = async (
+ transactions: Transaction[]
+ ) => {
+ await signAndSendTransactions({
+ transactions,
+ transactionsDisplayInfo: PING_TRANSACTION_INFO
+ });
+ };
+
+ const sendPongTransaction = async () => {
+ const pongTransaction = new Transaction({
+ value: BigInt(0),
+ data: Buffer.from('pong'),
+ receiver: new Address(contractAddress),
+ gasLimit: BigInt(6000000),
+ gasPrice: BigInt(GAS_PRICE),
+ chainID: network.chainId,
+ sender: new Address(address),
+ version: 1
+ });
+
+ await signAndSendTransactions({
+ transactions: [pongTransaction],
+ transactionsDisplayInfo: PONG_TRANSACTION_INFO
+ });
+ };
+
+ const sendPongTransactionFromAbi = async () => {
+ const scFactory = await getSmartContractFactory();
+ const pongTransaction = scFactory.createTransactionForExecute(
+ new Address(address),
+ {
+ gasLimit: BigInt(6000000),
+ function: 'pong',
+ contract: new Address(contractAddress),
+ nativeTransferAmount: BigInt(0)
+ }
+ );
+
+ const sessionId = await signAndSendTransactions({
+ transactions: [pongTransaction],
+ transactionsDisplayInfo: PONG_TRANSACTION_INFO
+ });
+
+ return sessionId;
+ };
+
+ const sendPongTransactionFromService = async (
+ transactions: Transaction[]
+ ) => {
+ const sessionId = await signAndSendTransactions({
+ transactions,
+ transactionsDisplayInfo: PONG_TRANSACTION_INFO
+ });
+
+ return sessionId;
+ };
return {
sendPingTransaction,
@@ -225,7 +143,6 @@ export const useSendPingPongTransaction = ({
sendPongTransaction,
sendPongTransactionFromAbi,
sendPingTransactionFromService,
- sendPongTransactionFromService,
- transactionStatus
+ sendPongTransactionFromService
};
};
diff --git a/src/hooks/useIsWebProvider.ts b/src/hooks/useIsWebProvider.ts
deleted file mode 100644
index 3b41ea78..00000000
--- a/src/hooks/useIsWebProvider.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { LoginMethodsEnum, useGetAccountProvider } from 'lib';
-
-export const useIsWebProvider = () => {
- const { providerType } = useGetAccountProvider();
- const isWebProvider = providerType === LoginMethodsEnum.wallet;
-
- return { isWebProvider };
-};
diff --git a/src/hooks/useScrollToElement.ts b/src/hooks/useScrollToElement.ts
deleted file mode 100644
index 62489666..00000000
--- a/src/hooks/useScrollToElement.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
-
-export const useScrollToElement = () => {
- const location = useLocation();
-
- useEffect(() => {
- const [, anchor] = location.hash.split('#');
-
- if (!anchor) {
- return;
- }
-
- const element = document.getElementById(anchor);
-
- if (!element) {
- return;
- }
-
- element.scrollIntoView();
- }, [location.hash]);
-};
diff --git a/src/index.tsx b/src/index.tsx
index 44bfaf02..da6a66f7 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,7 +1,13 @@
-import { createRoot } from 'react-dom/client';
-import './styles/globals.css';
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { initApp } from 'lib';
import { App } from './App';
+import { config } from './initConfig';
-const container = document.getElementById('root');
-const root = createRoot(container as HTMLElement);
-root.render((
) as any);
+initApp(config).then(() => {
+ ReactDOM.createRoot(document.getElementById('root')!).render(
+
+
+
+ );
+});
diff --git a/src/initConfig.ts b/src/initConfig.ts
new file mode 100644
index 00000000..7b13c53f
--- /dev/null
+++ b/src/initConfig.ts
@@ -0,0 +1,34 @@
+import './styles/globals.css';
+
+import { walletConnectV2ProjectId } from 'config';
+import { EnvironmentsEnum, ICustomProvider, InitAppType } from './lib';
+import { InMemoryProvider } from './provider/inMemoryProvider';
+
+const providers: ICustomProvider[] = [
+ {
+ name: 'In Memory Provider',
+ type: 'inMemoryProvider',
+ iconUrl: `${window.location.origin}/multiversx-white.svg`,
+ constructor: async (options) => new InMemoryProvider(options)
+ }
+];
+
+(window as any).multiversx = {};
+// Option 1: Add providers using the `window.providers` array
+(window as any).multiversx.providers = providers;
+
+export const config: InitAppType = {
+ storage: { getStorageCallback: () => sessionStorage },
+ dAppConfig: {
+ nativeAuth: true,
+ environment: EnvironmentsEnum.devnet,
+ providers: {
+ walletConnect: {
+ walletConnectV2ProjectId
+ }
+ }
+ }
+
+ // Option 2: Add providers using the config `customProviders` array
+ // customProviders: [providers]
+};
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 6a1ace50..e430b05e 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -1,2 +1,4 @@
export * from './sdkCore';
export * from './sdkDapp';
+export * from './sdkDappUI';
+export * from './sdkDappUtils';
diff --git a/src/lib/sdkCore.ts b/src/lib/sdkCore.ts
index 88751e24..a7b28c49 100644
--- a/src/lib/sdkCore.ts
+++ b/src/lib/sdkCore.ts
@@ -4,9 +4,17 @@ export {
AddressValue,
ContractFunction,
Message,
+ MessageComputer,
ProxyNetworkProvider,
SmartContract,
SmartContractController,
+ SmartContractTransactionsFactory,
+ Token,
TokenTransfer,
- Transaction
+ Transaction,
+ TransactionComputer,
+ TransactionsFactoryConfig,
+ TransferTransactionsFactory,
+ UserSecretKey,
+ UserSigner
} from '@multiversx/sdk-core';
diff --git a/src/lib/sdkDapp/components/CopyButton/CopyButton.tsx b/src/lib/sdkDapp/components/CopyButton/CopyButton.tsx
new file mode 100644
index 00000000..19f1dc21
--- /dev/null
+++ b/src/lib/sdkDapp/components/CopyButton/CopyButton.tsx
@@ -0,0 +1,20 @@
+import { MvxCopyButton } from 'lib/sdkDappUI/sdkDappUI.components';
+import { MvxCopyButtonPropsType } from 'lib/sdkDappUI/sdkDappUI.types';
+
+export const CopyButton = ({
+ className,
+ text,
+ copyIcon,
+ iconClass,
+ successIcon
+}: Partial
) => {
+ return (
+
+ );
+};
diff --git a/src/lib/sdkDapp/components/CopyButton/index.ts b/src/lib/sdkDapp/components/CopyButton/index.ts
new file mode 100644
index 00000000..367e65cb
--- /dev/null
+++ b/src/lib/sdkDapp/components/CopyButton/index.ts
@@ -0,0 +1 @@
+export * from './CopyButton';
diff --git a/src/lib/sdkDapp/components/ExplorerLink/ExplorerLink.tsx b/src/lib/sdkDapp/components/ExplorerLink/ExplorerLink.tsx
new file mode 100644
index 00000000..cb725baf
--- /dev/null
+++ b/src/lib/sdkDapp/components/ExplorerLink/ExplorerLink.tsx
@@ -0,0 +1,29 @@
+import { PropsWithChildren } from 'react';
+import { useGetNetworkConfig } from 'lib/sdkDapp/sdkDapp.hooks';
+import { MvxExplorerLink } from 'lib/sdkDappUI/sdkDappUI.components';
+import { WithClassnameType } from 'types/components.types';
+
+export const ExplorerLink = ({
+ children,
+ page,
+ className,
+ 'data-testid': dataTestId
+}: ExplorerLinkPropsType) => {
+ const { network } = useGetNetworkConfig();
+
+ return (
+
+ {children ? {children} : null}
+
+ );
+};
+
+export interface ExplorerLinkPropsType
+ extends WithClassnameType,
+ PropsWithChildren {
+ page: string;
+}
diff --git a/src/lib/sdkDapp/components/ExplorerLink/index.ts b/src/lib/sdkDapp/components/ExplorerLink/index.ts
new file mode 100644
index 00000000..0c7d53d6
--- /dev/null
+++ b/src/lib/sdkDapp/components/ExplorerLink/index.ts
@@ -0,0 +1 @@
+export * from './ExplorerLink';
diff --git a/src/lib/sdkDapp/components/FormatAmount/FormatAmount.tsx b/src/lib/sdkDapp/components/FormatAmount/FormatAmount.tsx
new file mode 100644
index 00000000..6ea159a4
--- /dev/null
+++ b/src/lib/sdkDapp/components/FormatAmount/FormatAmount.tsx
@@ -0,0 +1,39 @@
+import { WithClassnameType } from 'types';
+import { MvxFormatAmount } from '../../../sdkDappUI/sdkDappUI.components';
+import { MvxFormatAmountPropsType } from '../../../sdkDappUI/sdkDappUI.types';
+import { DECIMALS, DIGITS } from '../../../sdkDappUtils';
+import { FormatAmountController } from '../../sdkDapp.helpers';
+import { useGetNetworkConfig } from '../../sdkDapp.hooks';
+
+interface IFormatAmountProps
+ extends Partial,
+ WithClassnameType {
+ value: string;
+}
+
+export const FormatAmount = (props: IFormatAmountProps) => {
+ const {
+ network: { egldLabel }
+ } = useGetNetworkConfig();
+
+ const { isValid, valueDecimal, valueInteger, label } =
+ FormatAmountController.getData({
+ digits: DIGITS,
+ decimals: DECIMALS,
+ egldLabel,
+ ...props,
+ input: props.value
+ });
+
+ return (
+
+ );
+};
diff --git a/src/lib/sdkDapp/components/FormatAmount/index.ts b/src/lib/sdkDapp/components/FormatAmount/index.ts
new file mode 100644
index 00000000..3578b893
--- /dev/null
+++ b/src/lib/sdkDapp/components/FormatAmount/index.ts
@@ -0,0 +1 @@
+export * from './FormatAmount';
diff --git a/src/lib/sdkDapp/components/index.tsx b/src/lib/sdkDapp/components/index.tsx
new file mode 100644
index 00000000..b4193d3b
--- /dev/null
+++ b/src/lib/sdkDapp/components/index.tsx
@@ -0,0 +1,3 @@
+export * from './CopyButton';
+export * from './ExplorerLink';
+export * from './FormatAmount';
diff --git a/src/lib/sdkDapp/index.ts b/src/lib/sdkDapp/index.ts
index 4f89aa43..b347b18f 100644
--- a/src/lib/sdkDapp/index.ts
+++ b/src/lib/sdkDapp/index.ts
@@ -1,4 +1,4 @@
-export * from './sdkDapp.components';
+export * from './components';
export * from './sdkDapp.constants';
export * from './sdkDapp.helpers';
export * from './sdkDapp.hooks';
diff --git a/src/lib/sdkDapp/sdkDapp.components.ts b/src/lib/sdkDapp/sdkDapp.components.ts
deleted file mode 100644
index eec2024e..00000000
--- a/src/lib/sdkDapp/sdkDapp.components.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * components get re-exported because it makes the build size smaller
- * and allows testing with Jest (see `moduleNameMapper` in package.json)
- */
-export { ACCOUNTS_ENDPOINT } from '@multiversx/sdk-dapp/apiCalls/endpoints';
-export { AxiosInterceptorContext } from '@multiversx/sdk-dapp/wrappers/AxiosInterceptorContext/AxiosInterceptorContext';
-export { CopyButton } from '@multiversx/sdk-dapp/UI/CopyButton/CopyButton';
-export { CrossWindowLoginButton } from '@multiversx/sdk-dapp/UI/webWallet/CrossWindowLoginButton/CrossWindowLoginButton';
-export { DappProvider } from '@multiversx/sdk-dapp/wrappers/DappProvider/DappProvider';
-export { ExplorerLink } from '@multiversx/sdk-dapp/UI/ExplorerLink';
-export { ExtensionLoginButton } from '@multiversx/sdk-dapp/UI/extension/ExtensionLoginButton/ExtensionLoginButton';
-export { FormatAmount } from '@multiversx/sdk-dapp/UI/FormatAmount/FormatAmount';
-export { IframeButton } from '@multiversx/sdk-dapp/UI/iframe/IframeLoginButton/IframeButton';
-export { LedgerLoginButton } from '@multiversx/sdk-dapp/UI/ledger/LedgerLoginButton/LedgerLoginButton';
-export { Loader } from '@multiversx/sdk-dapp/UI/Loader/Loader';
-export { NotificationModal } from '@multiversx/sdk-dapp/UI/NotificationModal/NotificationModal';
-export { OperaWalletLoginButton } from '@multiversx/sdk-dapp/UI/operaWallet/OperaWalletLoginButton/OperaWalletLoginButton';
-export { PageState } from '@multiversx/sdk-dapp/UI/PageState/PageState';
-export { SignTransactionsModals } from '@multiversx/sdk-dapp/UI/SignTransactionsModals/SignTransactionsModals';
-export { TransactionRow } from '@multiversx/sdk-dapp/UI/TransactionsTable/components/TransactionRow';
-export { TransactionsTable } from '@multiversx/sdk-dapp/UI/TransactionsTable/TransactionsTable';
-export { TransactionsToastList } from '@multiversx/sdk-dapp/UI/TransactionsToastList/TransactionsToastList';
-export { WalletConnectLoginButton } from '@multiversx/sdk-dapp/UI/walletConnect/WalletConnectLoginButton/WalletConnectLoginButton';
-export { WebWalletLoginButton } from '@multiversx/sdk-dapp/UI/webWallet/WebWalletLoginButton/WebWalletLoginButton';
-export { XaliasCrossWindowLoginButton } from '@multiversx/sdk-dapp/UI/webWallet/XaliasCrossWindowLoginButton/XaliasCrossWindowLoginButton';
-export { XaliasLoginButton } from '@multiversx/sdk-dapp/UI/webWallet/XaliasLoginButton/XaliasLoginButton';
diff --git a/src/lib/sdkDapp/sdkDapp.constants.ts b/src/lib/sdkDapp/sdkDapp.constants.ts
index e5e48aec..04d62a38 100644
--- a/src/lib/sdkDapp/sdkDapp.constants.ts
+++ b/src/lib/sdkDapp/sdkDapp.constants.ts
@@ -1,9 +1,8 @@
export {
- DECIMALS,
- EXTRA_GAS_LIMIT_GUARDED_TX,
- GAS_LIMIT,
+ ACCOUNTS_ENDPOINT,
+ TRANSACTIONS_ENDPOINT
+} from '@multiversx/sdk-dapp/out/apiCalls/endpoints';
+export {
GAS_PRICE,
- VERSION,
- WALLET_PROVIDER_SEND_TRANSACTION_URL
-} from '@multiversx/sdk-dapp/constants';
-export { TRANSACTIONS_ENDPOINT } from '@multiversx/sdk-dapp/apiCalls/endpoints';
+ VERSION
+} from '@multiversx/sdk-dapp/out/constants/mvx.constants';
diff --git a/src/lib/sdkDapp/sdkDapp.helpers.ts b/src/lib/sdkDapp/sdkDapp.helpers.ts
index 45edd1fc..174f60cd 100644
--- a/src/lib/sdkDapp/sdkDapp.helpers.ts
+++ b/src/lib/sdkDapp/sdkDapp.helpers.ts
@@ -1,22 +1,15 @@
-export { addressIsValid } from '@multiversx/sdk-dapp/utils/account/addressIsValid';
-export {
- deleteTransactionToast,
- removeAllSignedTransactions,
- removeAllTransactionsToSign
-} from '@multiversx/sdk-dapp/services/transactions/clearTransactions';
-export { getInterpretedTransaction } from '@multiversx/sdk-dapp/utils/transactions/getInterpretedTransaction';
-export { getIsProviderEqualTo } from '@multiversx/sdk-dapp/utils/account/getIsProviderEqualTo';
-export { getTransactions } from '@multiversx/sdk-dapp/apiCalls/transactions/getTransactions';
-export { logout } from '@multiversx/sdk-dapp/utils/logout';
-export { newTransaction } from '@multiversx/sdk-dapp/models';
-export { parseAmount } from '@multiversx/sdk-dapp/utils/operations/parseAmount';
-export { refreshAccount } from '@multiversx/sdk-dapp/utils/account/refreshAccount';
-export { sendBatchTransactions } from '@multiversx/sdk-dapp/services/transactions/sendBatchTransactions';
-export { sendTransactions } from '@multiversx/sdk-dapp/services/transactions/sendTransactions';
-export {
- setTransactionsDisplayInfoState,
- setTransactionsToSignedState
-} from '@multiversx/sdk-dapp/services/transactions/updateSignedTransactions';
-export { signTransactions } from '@multiversx/sdk-dapp/services/transactions/signTransactions';
-export { trimUsernameDomain } from '@multiversx/sdk-dapp/hooks/account/helpers';
-export { verifyMessage } from '@multiversx/sdk-dapp/hooks/signMessage/verifyMessage';
+export { FormatAmountController } from '@multiversx/sdk-dapp/out/controllers/FormatAmountController';
+export { NotificationsFeedManager } from '@multiversx/sdk-dapp/out/managers/NotificationsFeedManager/NotificationsFeedManager';
+export { TransactionManager } from '@multiversx/sdk-dapp/out/managers/TransactionManager';
+export { TransactionsTableController } from '@multiversx/sdk-dapp/out/controllers/TransactionsTableController';
+export { UnlockPanelManager } from '@multiversx/sdk-dapp/out/managers/UnlockPanelManager';
+export { WALLET_PROVIDER_SEND_TRANSACTION_URL } from '@multiversx/sdk-dapp/out/constants/webWalletProvider.constants';
+export { getAccountProvider } from '@multiversx/sdk-dapp/out/providers/helpers/accountProvider';
+export { getActiveTransactionsStatus } from '@multiversx/sdk-dapp/out/utils/transactions/getActiveTransactionsStatus';
+export { getExplorerLink } from '@multiversx/sdk-dapp/out/utils/transactions/getExplorerLink';
+export { getInterpretedTransaction } from '@multiversx/sdk-dapp/out/utils/transactions/getInterpretedTransaction';
+export { getTransactions } from '@multiversx/sdk-dapp/out/apiCalls/transactions/getTransactions';
+export { initApp } from '@multiversx/sdk-dapp/out/methods/initApp/initApp';
+export { setAxiosInterceptors } from '@multiversx/sdk-dapp/out/utils/network/setAxiosInterceptors';
+export { signTransactions } from '@multiversx/sdk-dapp/out/providers/strategies/helpers/signTransactions/signTransactions';
+export { trimUsernameDomain } from '@multiversx/sdk-dapp/out/utils/account/trimUsernameDomain';
diff --git a/src/lib/sdkDapp/sdkDapp.hooks.ts b/src/lib/sdkDapp/sdkDapp.hooks.ts
index 0dffc93a..eab4bf67 100644
--- a/src/lib/sdkDapp/sdkDapp.hooks.ts
+++ b/src/lib/sdkDapp/sdkDapp.hooks.ts
@@ -1,21 +1,6 @@
-export { useBatchTransactionsTracker } from '@multiversx/sdk-dapp/hooks/transactions/batch/tracker/useBatchTransactionsTracker';
-export { useCheckBatch } from '@multiversx/sdk-dapp/hooks/transactions/batch/tracker/useCheckBatch';
-export { useGetAccount } from '@multiversx/sdk-dapp/hooks/account/useGetAccount';
-export { useGetAccountInfo } from '@multiversx/sdk-dapp/hooks/account/useGetAccountInfo';
-export { useGetAccountProvider } from '@multiversx/sdk-dapp/hooks/account/useGetAccountProvider';
-export { useGetActiveTransactionsStatus } from '@multiversx/sdk-dapp/hooks/transactions/useGetActiveTransactionsStatus';
-export { useGetBatches } from '@multiversx/sdk-dapp/hooks/transactions/batch/useGetBatches';
-export { useGetIsLoggedIn } from '@multiversx/sdk-dapp/hooks/account/useGetIsLoggedIn';
-export { useGetLastSignedMessageSession } from '@multiversx/sdk-dapp/hooks/signMessage/useGetLastSignedMessageSession';
-export { useGetLoginInfo } from '@multiversx/sdk-dapp/hooks/account/useGetLoginInfo';
-export { useGetNetworkConfig } from '@multiversx/sdk-dapp/hooks/useGetNetworkConfig';
-export { useGetPendingTransactions } from '@multiversx/sdk-dapp/hooks/transactions/useGetPendingTransactions';
-export { useGetSignMessageInfoStatus } from '@multiversx/sdk-dapp/hooks/signMessage/useGetSignedMessageStatus';
-export { useGetSignMessageSession } from '@multiversx/sdk-dapp/hooks/signMessage/useGetSignMessageSession';
-export { useGetSignedTransactions } from '@multiversx/sdk-dapp/hooks/transactions/useGetSignedTransactions';
-export { useParseSignedTransactions } from '@multiversx/sdk-dapp/hooks/transactions/useParseSignedTransactions';
-export { useSendBatchTransactions } from '@multiversx/sdk-dapp/hooks/transactions/batch/useSendBatchTransactions';
-export { useSignMessage } from '@multiversx/sdk-dapp/hooks/signMessage/useSignMessage';
-export { useSignTransactions } from '@multiversx/sdk-dapp/hooks/transactions/useSignTransactions';
-export { useTrackTransactionStatus } from '@multiversx/sdk-dapp/hooks/transactions/useTrackTransactionStatus';
-export { useTransactionsTracker } from '@multiversx/sdk-dapp/hooks/transactions/useTransactionsTracker';
+export { useGetAccount } from '@multiversx/sdk-dapp/out/react/account/useGetAccount';
+export { useGetAccountInfo } from '@multiversx/sdk-dapp/out/react/account/useGetAccountInfo';
+export { useGetIsLoggedIn } from '@multiversx/sdk-dapp/out/react/account/useGetIsLoggedIn';
+export { useGetLoginInfo } from '@multiversx/sdk-dapp/out/react/loginInfo/useGetLoginInfo';
+export { useGetNetworkConfig } from '@multiversx/sdk-dapp/out/react/network/useGetNetworkConfig';
+export { useGetPendingTransactions } from '@multiversx/sdk-dapp/out/react/transactions/useGetPendingTransactions';
diff --git a/src/lib/sdkDapp/sdkDapp.types.ts b/src/lib/sdkDapp/sdkDapp.types.ts
index 853325b6..1395fe76 100644
--- a/src/lib/sdkDapp/sdkDapp.types.ts
+++ b/src/lib/sdkDapp/sdkDapp.types.ts
@@ -1,14 +1,9 @@
-export type { AccountType } from '@multiversx/sdk-dapp/types/account.types';
-export {
- EnvironmentsEnum,
- LoginMethodsEnum,
- SignedMessageStatusesEnum
-} from '@multiversx/sdk-dapp/types/enums.types';
-export type {
- RawTransactionType,
- SignedTransactionType,
- TransactionsDisplayInfoType
-} from '@multiversx/sdk-dapp/types/transactions.types';
-export type { RouteType } from '@multiversx/sdk-dapp/types/index';
-export type { ServerTransactionType } from '@multiversx/sdk-dapp/types/serverTransactions.types';
-export { TransactionBatchStatusesEnum } from '@multiversx/sdk-dapp/types/enums.types';
+export type { AccountType } from '@multiversx/sdk-dapp/out/types/account.types';
+export { EnvironmentsEnum } from '@multiversx/sdk-dapp/out/types/enums.types';
+export type { ICustomProvider } from '@multiversx/sdk-dapp/out/providers/types/providerFactory.types';
+export type { IProvider } from '@multiversx/sdk-dapp/out/providers/types/providerFactory.types';
+export type { InitAppType } from '@multiversx/sdk-dapp/out/methods/initApp/initApp.types';
+export type { ServerTransactionType } from '@multiversx/sdk-dapp/out/types/serverTransactions.types';
+export type { SignedTransactionType } from '@multiversx/sdk-dapp/out/types/transactions.types';
+export type { TransactionsDisplayInfoType } from '@multiversx/sdk-dapp/out/types/transactions.types';
+export type { TransactionsRowType } from '@multiversx/sdk-dapp/out/controllers/TransactionsTableController/transactionsTableController.types';
diff --git a/src/lib/sdkDappUI/index.ts b/src/lib/sdkDappUI/index.ts
new file mode 100644
index 00000000..3f099713
--- /dev/null
+++ b/src/lib/sdkDappUI/index.ts
@@ -0,0 +1,2 @@
+export * from './sdkDappUI.components';
+export * from './sdkDappUI.types';
diff --git a/src/lib/sdkDappUI/sdkDappUI.components.ts b/src/lib/sdkDappUI/sdkDappUI.components.ts
new file mode 100644
index 00000000..ec5d3e68
--- /dev/null
+++ b/src/lib/sdkDappUI/sdkDappUI.components.ts
@@ -0,0 +1,7 @@
+export {
+ MvxCopyButton,
+ MvxExplorerLink,
+ MvxFormatAmount,
+ MvxTransactionsTable,
+ MvxUnlockButton
+} from '@multiversx/sdk-dapp-ui/react';
diff --git a/src/lib/sdkDappUI/sdkDappUI.types.ts b/src/lib/sdkDappUI/sdkDappUI.types.ts
new file mode 100644
index 00000000..64af950b
--- /dev/null
+++ b/src/lib/sdkDappUI/sdkDappUI.types.ts
@@ -0,0 +1,3 @@
+export type { MvxCopyButton as MvxCopyButtonPropsType } from '@multiversx/sdk-dapp-ui/web-components/mvx-copy-button';
+export type { MvxExplorerLink as MvxExplorerLinkPropsType } from '@multiversx/sdk-dapp-ui/web-components/mvx-explorer-link';
+export type { MvxFormatAmount as MvxFormatAmountPropsType } from '@multiversx/sdk-dapp-ui/web-components/mvx-format-amount';
diff --git a/src/lib/sdkDappUtils/index.ts b/src/lib/sdkDappUtils/index.ts
new file mode 100644
index 00000000..5e18c9ec
--- /dev/null
+++ b/src/lib/sdkDappUtils/index.ts
@@ -0,0 +1,2 @@
+export * from './sdkDappUtils';
+export * from './sdkDappUtils.types';
diff --git a/src/lib/sdkDappUtils/sdkDappUtils.ts b/src/lib/sdkDappUtils/sdkDappUtils.ts
new file mode 100644
index 00000000..53640edd
--- /dev/null
+++ b/src/lib/sdkDappUtils/sdkDappUtils.ts
@@ -0,0 +1,3 @@
+export { DECIMALS, DIGITS } from '@multiversx/sdk-dapp-utils/out/constants';
+export { formatAmount } from '@multiversx/sdk-dapp-utils/out/helpers/formatAmount';
+export { parseAmount } from '@multiversx/sdk-dapp-utils/out/helpers/parseAmount';
diff --git a/src/lib/sdkDappUtils/sdkDappUtils.types.ts b/src/lib/sdkDappUtils/sdkDappUtils.types.ts
new file mode 100644
index 00000000..f72bbee0
--- /dev/null
+++ b/src/lib/sdkDappUtils/sdkDappUtils.types.ts
@@ -0,0 +1 @@
+export type { IDAppProviderAccount } from '@multiversx/sdk-dapp-utils/out/models';
diff --git a/src/localConstants/index.ts b/src/localConstants/index.ts
index be49925f..ace81441 100644
--- a/src/localConstants/index.ts
+++ b/src/localConstants/index.ts
@@ -1,4 +1,3 @@
export * from './dataTestIds.enum';
export * from './routes';
-export * from './session';
export * from './signMessage';
diff --git a/src/localConstants/session/index.ts b/src/localConstants/session/index.ts
deleted file mode 100644
index 82def9ba..00000000
--- a/src/localConstants/session/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './session.enums';
-
-export const isSafari = /^((?!chrome|android).)*safari/i.test(
- navigator.userAgent
-);
diff --git a/src/localConstants/session/session.enums.ts b/src/localConstants/session/session.enums.ts
deleted file mode 100644
index 38228a12..00000000
--- a/src/localConstants/session/session.enums.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export enum SessionEnum {
- batchSessionId = 'batchSessionId',
- signedSessionId = 'signedSessionId',
- rawPingPongSessionId = 'rawPingPongSessionId',
- abiPingPongSessionId = 'abiPingPongSessionId',
- abiPingPongServiceSessionId = 'abiPingPongServiceSessionId',
- batchId = 'batchId'
-}
diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx
index e61553e5..8bc779f9 100644
--- a/src/pages/Dashboard/Dashboard.tsx
+++ b/src/pages/Dashboard/Dashboard.tsx
@@ -1,5 +1,4 @@
import { contractAddress } from 'config';
-import { useScrollToElement } from 'hooks';
import { WidgetType } from 'types/widget.types';
import { Widget } from './components';
import {
@@ -26,8 +25,7 @@ const WIDGETS: WidgetType[] = [
description:
'Smart Contract interactions using manually formulated transactions',
reference:
- 'https://docs.multiversx.com/sdk-and-tools/indices/es-index-transactions/',
- anchor: 'ping-pong-manual'
+ 'https://docs.multiversx.com/sdk-and-tools/indices/es-index-transactions/'
},
{
title: 'Ping & Pong (ABI)',
@@ -35,23 +33,20 @@ const WIDGETS: WidgetType[] = [
description:
'Smart Contract interactions using the ABI generated transactions',
reference:
- 'https://docs.multiversx.com/sdk-and-tools/sdk-js/sdk-js-cookbook/#using-interaction-when-the-abi-is-available',
- anchor: 'ping-pong-abi'
+ 'https://docs.multiversx.com/sdk-and-tools/sdk-js/sdk-js-cookbook/#using-interaction-when-the-abi-is-available'
},
{
title: 'Ping & Pong (Backend)',
widget: PingPongService,
description:
'Smart Contract interactions using the backend generated transactions',
- reference: 'https://github.com/multiversx/mx-ping-pong-service',
- anchor: 'ping-pong-backend'
+ reference: 'https://github.com/multiversx/mx-ping-pong-service'
},
{
title: 'Sign message',
widget: SignMessage,
description: 'Message signing using the connected account',
- reference: 'https://docs.multiversx.com/sdk-and-tools/sdk-dapp/#account-1',
- anchor: 'sign-message'
+ reference: 'https://docs.multiversx.com/sdk-and-tools/sdk-dapp/#account-1'
},
{
title: 'Native auth',
@@ -66,8 +61,7 @@ const WIDGETS: WidgetType[] = [
description:
'For complex scenarios transactions can be sent in the desired group/sequence',
reference:
- 'https://github.com/multiversx/mx-sdk-dapp#sending-transactions-synchronously-in-batches',
- anchor: 'batch-transactions'
+ 'https://github.com/multiversx/mx-sdk-dapp#sending-transactions-synchronously-in-batches'
},
{
title: 'Transactions (All)',
@@ -87,8 +81,6 @@ const WIDGETS: WidgetType[] = [
];
export const Dashboard = () => {
- useScrollToElement();
-
return (
{WIDGETS.map((element) => (
diff --git a/src/pages/Dashboard/components/Widget.tsx b/src/pages/Dashboard/components/Widget.tsx
index 3177d7b5..9b7a7a90 100644
--- a/src/pages/Dashboard/components/Widget.tsx
+++ b/src/pages/Dashboard/components/Widget.tsx
@@ -1,7 +1,5 @@
import { Card } from 'components';
-import { useIsWebProvider } from 'hooks';
import { WidgetType } from 'types/widget.types';
-import { getCallbackRoute } from 'utils/getCallbackRoute';
export const Widget = ({
title,
@@ -11,11 +9,6 @@ export const Widget = ({
widget: MxWidget,
props = {}
}: WidgetType) => {
- const { isWebProvider } = useIsWebProvider();
- const callbackRoute = anchor
- ? getCallbackRoute({ anchor, isWebProvider })
- : '';
-
return (
-
+
);
};
diff --git a/src/pages/Dashboard/widgets/Account/Account.tsx b/src/pages/Dashboard/widgets/Account/Account.tsx
index 800e9b1a..ffeb1f84 100644
--- a/src/pages/Dashboard/widgets/Account/Account.tsx
+++ b/src/pages/Dashboard/widgets/Account/Account.tsx
@@ -1,12 +1,26 @@
import { Label, OutputContainer } from 'components';
-import { FormatAmount, useGetAccountInfo, useGetNetworkConfig } from 'lib';
-import { DataTestIdsEnum } from 'localConstants';
+import {
+ DECIMALS,
+ DIGITS,
+ FormatAmountController,
+ MvxFormatAmount,
+ useGetAccountInfo,
+ useGetNetworkConfig
+} from 'lib';
import { Username } from './components';
export const Account = () => {
const { network } = useGetNetworkConfig();
const { address, account } = useGetAccountInfo();
+ const { isValid, valueDecimal, valueInteger, label } =
+ FormatAmountController.getData({
+ digits: DIGITS,
+ decimals: DECIMALS,
+ egldLabel: network.egldLabel,
+ input: account.balance
+ });
+
return (
@@ -22,10 +36,13 @@ export const Account = () => {
-
);
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/getBatchTransactions.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/getBatchTransactions.ts
index b1dcc856..9aa6e7cf 100644
--- a/src/pages/Dashboard/widgets/BatchTransactions/helpers/getBatchTransactions.ts
+++ b/src/pages/Dashboard/widgets/BatchTransactions/helpers/getBatchTransactions.ts
@@ -1,41 +1,32 @@
+import BigNumber from 'bignumber.js';
import {
- DECIMALS,
- EXTRA_GAS_LIMIT_GUARDED_TX,
- GAS_LIMIT,
- GAS_PRICE,
- newTransaction,
- TokenTransfer,
+ Address,
Transaction,
- VERSION
+ TransactionsFactoryConfig,
+ TransferTransactionsFactory
} from 'lib';
-import { TransactionProps } from 'types/transaction.types';
+import { TransactionProps } from 'types';
const NUMBER_OF_TRANSACTIONS = 5;
export const getBatchTransactions = ({
address,
- nonce,
chainID
}: TransactionProps): Transaction[] => {
const transactions = Array.from(Array(NUMBER_OF_TRANSACTIONS).keys());
+ const factoryConfig = new TransactionsFactoryConfig({ chainID });
+ const factory = new TransferTransactionsFactory({ config: factoryConfig });
+
return transactions.map((id) => {
- const amount = TokenTransfer.fungibleFromAmount(
- '',
- id + 1,
- DECIMALS
- ).toString();
+ const tokenTransfer = factory.createTransactionForNativeTokenTransfer(
+ Address.newFromBech32(address),
+ {
+ receiver: Address.newFromBech32(address),
+ nativeAmount: BigInt(new BigNumber(id).plus(1).shiftedBy(18).toFixed())
+ }
+ );
- return newTransaction({
- sender: address,
- receiver: address,
- data: `batch-tx-${id + 1}`,
- value: amount,
- chainID,
- gasLimit: GAS_LIMIT + EXTRA_GAS_LIMIT_GUARDED_TX,
- gasPrice: GAS_PRICE,
- nonce,
- version: VERSION
- });
+ return tokenTransfer;
});
};
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/getSwapAndLockTransactions.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/getSwapAndLockTransactions.ts
index 0c15d064..4393ec37 100644
--- a/src/pages/Dashboard/widgets/BatchTransactions/helpers/getSwapAndLockTransactions.ts
+++ b/src/pages/Dashboard/widgets/BatchTransactions/helpers/getSwapAndLockTransactions.ts
@@ -1,5 +1,5 @@
import { BATCH_TRANSACTIONS_SC } from 'config';
-import { GAS_PRICE, newTransaction, Transaction, VERSION } from 'lib';
+import { Address, GAS_PRICE, Transaction, VERSION } from 'lib';
import { TransactionProps } from 'types';
export const getSwapAndLockTransactions = ({
@@ -8,49 +8,53 @@ export const getSwapAndLockTransactions = ({
nonce
}: TransactionProps): Transaction[] => {
return [
- newTransaction({
+ new Transaction({
chainID,
- gasLimit: 4200000,
- gasPrice: GAS_PRICE,
- nonce,
- receiver: BATCH_TRANSACTIONS_SC.egld_wEGLD.contract,
- sender: address,
- value: '1000000000000000000',
+ gasLimit: BigInt(4200000),
+ gasPrice: BigInt(GAS_PRICE),
+ nonce: BigInt(nonce),
+ receiver: Address.newFromBech32(
+ BATCH_TRANSACTIONS_SC.egld_wEGLD.contract
+ ),
+ sender: Address.newFromBech32(address),
+ value: BigInt('1000000000000000000'),
version: VERSION,
- data: BATCH_TRANSACTIONS_SC.egld_wEGLD.data
+ data: Uint8Array.from(Buffer.from(BATCH_TRANSACTIONS_SC.egld_wEGLD.data))
}),
- newTransaction({
+ new Transaction({
chainID,
- gasLimit: 25500000,
- gasPrice: GAS_PRICE,
- nonce,
- receiver: BATCH_TRANSACTIONS_SC.wEGLD_USDC.contract,
- sender: address,
- value: '0',
+ gasLimit: BigInt(25500000),
+ gasPrice: BigInt(GAS_PRICE),
+ nonce: BigInt(nonce),
+ receiver: Address.newFromBech32(
+ BATCH_TRANSACTIONS_SC.wEGLD_USDC.contract
+ ),
+ sender: Address.newFromBech32(address),
+ value: BigInt('0'),
version: VERSION,
- data: BATCH_TRANSACTIONS_SC.wEGLD_USDC.data
+ data: Uint8Array.from(Buffer.from(BATCH_TRANSACTIONS_SC.wEGLD_USDC.data))
}),
- newTransaction({
+ new Transaction({
chainID,
- gasLimit: 25500000,
- gasPrice: GAS_PRICE,
- nonce,
- receiver: BATCH_TRANSACTIONS_SC.wEGLD_MEX.contract,
- sender: address,
- value: '0',
+ gasLimit: BigInt(25500000),
+ gasPrice: BigInt(GAS_PRICE),
+ nonce: BigInt(nonce),
+ receiver: Address.newFromBech32(BATCH_TRANSACTIONS_SC.wEGLD_MEX.contract),
+ sender: Address.newFromBech32(address),
+ value: BigInt('0'),
version: VERSION,
- data: BATCH_TRANSACTIONS_SC.wEGLD_MEX.data
+ data: Uint8Array.from(Buffer.from(BATCH_TRANSACTIONS_SC.wEGLD_MEX.data))
}),
- newTransaction({
+ new Transaction({
chainID,
- gasLimit: 10000000,
- gasPrice: GAS_PRICE,
- nonce,
- receiver: BATCH_TRANSACTIONS_SC.lock_MEX.contract,
- sender: address,
- value: '0',
+ gasLimit: BigInt(10000000),
+ gasPrice: BigInt(GAS_PRICE),
+ nonce: BigInt(nonce),
+ receiver: Address.newFromBech32(BATCH_TRANSACTIONS_SC.lock_MEX.contract),
+ sender: Address.newFromBech32(address),
+ value: BigInt('0'),
version: VERSION,
- data: BATCH_TRANSACTIONS_SC.lock_MEX.data
+ data: Uint8Array.from(Buffer.from(BATCH_TRANSACTIONS_SC.lock_MEX.data))
})
];
};
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendAndTrackTransactions.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendAndTrackTransactions.ts
new file mode 100644
index 00000000..0ee3fda0
--- /dev/null
+++ b/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendAndTrackTransactions.ts
@@ -0,0 +1,25 @@
+import {
+ Transaction,
+ TransactionManager,
+ TransactionsDisplayInfoType
+} from 'lib';
+
+type SendAndTrackTransactionsType = {
+ transactions: Transaction[] | Transaction[][];
+ options?: {
+ disableToasts?: boolean;
+ transactionsDisplayInfo?: TransactionsDisplayInfoType;
+ };
+};
+
+export const sendAndTrackTransactions = async ({
+ transactions,
+ options
+}: SendAndTrackTransactionsType) => {
+ const txManager = TransactionManager.getInstance();
+
+ const sentTransactions = await txManager.send(transactions);
+ const sessionId = await txManager.track(sentTransactions, options);
+
+ return sessionId;
+};
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendBatchTransactions.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendBatchTransactions.ts
index dedb0830..9f29cdde 100644
--- a/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendBatchTransactions.ts
+++ b/src/pages/Dashboard/widgets/BatchTransactions/helpers/sendBatchTransactions.ts
@@ -1,38 +1,32 @@
-import { sendTransactions } from 'lib/sdkDapp/sdkDapp.helpers';
-import { isSafari, SessionEnum } from 'localConstants/session';
-import { getBatchTransactions } from '../helpers';
-import { SendTransactionProps } from '../types';
+import { getAccountProvider } from 'lib';
+import { TransactionProps } from 'types';
+import { getBatchTransactions } from './getBatchTransactions';
+import { sendAndTrackTransactions } from './sendAndTrackTransactions';
export const sendBatchTransactions = async ({
address,
chainID,
- nonce,
- callbackRoute
-}: SendTransactionProps) => {
- const transactions = getBatchTransactions({
+ nonce
+}: TransactionProps) => {
+ const provider = getAccountProvider();
+
+ const transactionsToSign = getBatchTransactions({
address,
chainID,
nonce
});
- const { sessionId, error } = await sendTransactions({
- transactions,
- signWithoutSending: true,
- customTransactionInformation: { redirectAfterSign: true },
- callbackRoute,
- hasConsentPopup: isSafari
- });
+ const transactions = await provider.signTransactions(transactionsToSign);
- if (error) {
- console.error('Could not execute transactions', error);
- return {};
- }
+ const groupedTransactions = [
+ [transactions[0]],
+ [transactions[1], transactions[2]],
+ [transactions[3], transactions[4]]
+ ];
- const newBatchSessionId = Date.now().toString();
- // sdk-dapp by default takes the last session id from sdk-dapp’s redux store on page refresh
- // in order to differentiate the transactions between widgets, a persistence of sessionId is needed
- sessionStorage.setItem(SessionEnum.batchSessionId, newBatchSessionId);
- sessionStorage.setItem(SessionEnum.signedSessionId, sessionId);
+ const sessionId = await sendAndTrackTransactions({
+ transactions: groupedTransactions
+ });
- return { newBatchSessionId, sessionId };
+ return sessionId;
};
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/signAndAutoSendBatchTransactions.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/signAndAutoSendBatchTransactions.ts
index 8d1b8ea2..8140cb16 100644
--- a/src/pages/Dashboard/widgets/BatchTransactions/helpers/signAndAutoSendBatchTransactions.ts
+++ b/src/pages/Dashboard/widgets/BatchTransactions/helpers/signAndAutoSendBatchTransactions.ts
@@ -1,47 +1,42 @@
-import { refreshAccount, sendBatchTransactions } from 'lib';
-import { isSafari, SessionEnum } from 'localConstants/session';
-import { getBatchTransactions } from '../helpers';
-import { SendTransactionProps } from '../types';
+import { getAccountProvider, TransactionsDisplayInfoType } from 'lib';
+import { TransactionProps } from 'types';
+import { getBatchTransactions } from './getBatchTransactions';
+import { sendAndTrackTransactions } from './sendAndTrackTransactions';
-// this process will not go through useSendSignedTransactions
-// it will automatically sign and send transactions
export const signAndAutoSendBatchTransactions = async ({
address,
nonce,
chainID,
- callbackRoute
-}: SendTransactionProps) => {
+ transactionsDisplayInfo = {
+ processingMessage: 'Processing transactions',
+ errorMessage: 'An error has occurred during transaction execution',
+ successMessage: 'Batch transactions successful'
+ }
+}: TransactionProps & {
+ transactionsDisplayInfo?: TransactionsDisplayInfoType;
+}) => {
+ const provider = getAccountProvider();
+
const transactions = getBatchTransactions({
address,
nonce,
chainID
});
+ const signedTransactions = await provider.signTransactions(transactions);
+
const groupedTransactions = [
- [transactions[0]],
- [transactions[1], transactions[2]],
- [transactions[3], transactions[4]]
+ [signedTransactions[0]],
+ [signedTransactions[1], signedTransactions[2]],
+ [signedTransactions[3], signedTransactions[4]]
];
- await refreshAccount();
-
- const { batchId, error } = await sendBatchTransactions({
+ const sessionId = await sendAndTrackTransactions({
transactions: groupedTransactions,
- customTransactionInformation: { redirectAfterSign: true },
- transactionsDisplayInfo: {
- processingMessage: 'Processing transactions',
- errorMessage: 'An error has occurred during transaction execution',
- successMessage: 'Batch transactions successful'
- },
- callbackRoute,
- hasConsentPopup: isSafari
+ options: {
+ transactionsDisplayInfo
+ }
});
- if (error) {
- console.error('Could not execute transactions', error);
- return {};
- }
-
- sessionStorage.setItem(SessionEnum.batchId, batchId);
- return { batchId };
+ return sessionId;
};
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/helpers/swapAndLockTokens.ts b/src/pages/Dashboard/widgets/BatchTransactions/helpers/swapAndLockTokens.ts
index 2454718b..165a6527 100644
--- a/src/pages/Dashboard/widgets/BatchTransactions/helpers/swapAndLockTokens.ts
+++ b/src/pages/Dashboard/widgets/BatchTransactions/helpers/swapAndLockTokens.ts
@@ -1,46 +1,42 @@
-import { refreshAccount, sendBatchTransactions } from 'lib';
-import { isSafari, SessionEnum } from 'localConstants/session';
-import { getSwapAndLockTransactions } from '../helpers';
-import { SendTransactionProps } from '../types';
+import { getAccountProvider, TransactionsDisplayInfoType } from 'lib';
+import { TransactionProps } from 'types';
+import { getSwapAndLockTransactions } from './getSwapAndLockTransactions';
+import { sendAndTrackTransactions } from './sendAndTrackTransactions';
export const swapAndLockTokens = async ({
address,
nonce,
chainID,
- callbackRoute
-}: SendTransactionProps) => {
- const transactions = getSwapAndLockTransactions({
+ transactionsDisplayInfo = {
+ processingMessage: 'Processing transactions',
+ errorMessage: 'An error has occurred during transaction execution',
+ successMessage: 'Swap and lock transactions successful'
+ }
+}: TransactionProps & {
+ transactionsDisplayInfo?: TransactionsDisplayInfoType;
+}) => {
+ const provider = getAccountProvider();
+
+ const transactionsToSign = getSwapAndLockTransactions({
address,
chainID,
nonce
});
+ const transactions = await provider.signTransactions(transactionsToSign);
+
const groupedTransactions = [
[transactions[0]],
[transactions[1], transactions[2]],
[transactions[3]]
];
- await refreshAccount();
-
- const { batchId, error } = await sendBatchTransactions({
+ const sessionId = await sendAndTrackTransactions({
transactions: groupedTransactions,
- customTransactionInformation: { redirectAfterSign: true },
- transactionsDisplayInfo: {
- processingMessage: 'Processing transactions',
- errorMessage: 'An error has occurred during transaction execution',
- successMessage: 'Batch transactions successful'
- },
- callbackRoute,
- hasConsentPopup: isSafari
+ options: {
+ transactionsDisplayInfo
+ }
});
- if (error) {
- console.error('Could not execute transactions', error);
- return {};
- }
-
- sessionStorage.setItem(SessionEnum.batchId, batchId);
-
- return { batchId };
+ return sessionId;
};
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/hooks/index.ts b/src/pages/Dashboard/widgets/BatchTransactions/hooks/index.ts
deleted file mode 100644
index e60e6be1..00000000
--- a/src/pages/Dashboard/widgets/BatchTransactions/hooks/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './useSendSignedTransactions';
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/hooks/useSendSignedTransactions.ts b/src/pages/Dashboard/widgets/BatchTransactions/hooks/useSendSignedTransactions.ts
deleted file mode 100644
index 8e001544..00000000
--- a/src/pages/Dashboard/widgets/BatchTransactions/hooks/useSendSignedTransactions.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { useEffect, useState } from 'react';
-import {
- deleteTransactionToast,
- removeAllSignedTransactions,
- removeAllTransactionsToSign,
- setTransactionsDisplayInfoState,
- setTransactionsToSignedState,
- TransactionBatchStatusesEnum,
- useGetSignedTransactions,
- useSendBatchTransactions
-} from 'lib';
-import { SessionEnum } from 'localConstants';
-import { useBatchTransactionContext } from 'wrappers';
-
-export const useSendSignedTransactions = ({
- signedSessionId = ''
-}: {
- signedSessionId: string;
-}) => {
- const [batchSessionId, setBatchSessionId] = useState