Merge pull request #102 from etherspot/feature/token-decimals-on-toke…

…n-components added token decimals to token related components
etherspot · Feb 22, 2024 · 691fa40 · 691fa40
2 parents d5c6bed + e0e22ec
commit 691fa40
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.7.5] - 2024-02-21
+
+### Added Changes
+- Added missing `tokenDecimals` param to `<EtherspotTokenTransferTransaction />` and `<EtherspotApprovalTransaction />` components
+
 ## [0.7.4] - 2024-02-20
 
 ### Added Changes

diff --git a/__tests__/components/EtherspotApprovalTransaction.test.js b/__tests__/components/EtherspotApprovalTransaction.test.js
@@ -69,7 +69,13 @@ describe('EtherspotApprovalTransaction', () => {
             <EtherspotApprovalTransaction
               tokenAddress={'0xe3818504c1b32bf1557b16c238b2e01fd3149c17'}
               receiverAddress={'0x7F30B1960D5556929B03a0339814fE903c55a347'}
-              value={ethers.utils.parseEther('123')}
+              value={ethers.utils.parseUnits('123', 10)}
+            />
+            <EtherspotApprovalTransaction
+              tokenAddress={'0xe3818504c1b32bf1557b16c238b2e01fd3149c17'}
+              receiverAddress={'0x7F30B1960D5556929B03a0339814fE903c55a347'}
+              value={'123'}
+              tokenDecimals={10}
             />
           </EtherspotBatch>
         </EtherspotBatches>
@@ -80,8 +86,9 @@ describe('EtherspotApprovalTransaction', () => {
     const { result: { current } } = renderHook(() => useEtherspotTransactions(), { wrapper });
 
     expect(current.batches[0].batches[0].transactions[0].to).toBe('0xe3818504c1b32bf1557b16c238b2e01fd3149c17');
-    expect(current.batches[0].batches[0].transactions[0].data).toBe('0x095ea7b30000000000000000000000007f30b1960d5556929b03a0339814fe903c55a347000000000000000000000000000000000000000000000006aaf7c8516d0c0000');
+    expect(current.batches[0].batches[0].transactions[0].data).toBe('0x095ea7b30000000000000000000000007f30b1960d5556929b03a0339814fe903c55a3470000000000000000000000000000000000000000000000000000011e61b68c00');
     expect(current.batches[0].batches[0].transactions[0].value).toBe(undefined);
+    expect(current.batches[0].batches[0].transactions[1].data).toBe('0x095ea7b30000000000000000000000007f30b1960d5556929b03a0339814fe903c55a3470000000000000000000000000000000000000000000000000000011e61b68c00');
   });
 
 })
diff --git a/__tests__/components/EtherspotTokenTransferTransaction.test.js b/__tests__/components/EtherspotTokenTransferTransaction.test.js
@@ -74,7 +74,13 @@ describe('EtherspotTokenTransferTransaction', () => {
             <EtherspotTokenTransferTransaction
               tokenAddress={'0xe3818504c1b32bf1557b16c238b2e01fd3149c17'}
               receiverAddress={'0x7F30B1960D5556929B03a0339814fE903c55a347'}
-              value={ethers.utils.parseEther('123')}
+              value={ethers.utils.parseUnits('123', 10)}
+            />
+            <EtherspotTokenTransferTransaction
+              tokenAddress={'0xe3818504c1b32bf1557b16c238b2e01fd3149c17'}
+              receiverAddress={'0x7F30B1960D5556929B03a0339814fE903c55a347'}
+              value={'123'}
+              tokenDecimals={10}
             />
           </EtherspotBatch>
         </EtherspotBatches>
@@ -88,7 +94,8 @@ describe('EtherspotTokenTransferTransaction', () => {
     await waitFor(() => expect(result.current.batches[0].batches[0].transactions[0]).not.toBe(undefined));
 
     expect(result.current.batches[0].batches[0].transactions[0].to).toBe('0xe3818504c1b32bf1557b16c238b2e01fd3149c17');
-    expect(result.current.batches[0].batches[0].transactions[0].data).toBe('0xa9059cbb0000000000000000000000007f30b1960d5556929b03a0339814fe903c55a347000000000000000000000000000000000000000000000006aaf7c8516d0c0000');
+    expect(result.current.batches[0].batches[0].transactions[0].data).toBe('0xa9059cbb0000000000000000000000007f30b1960d5556929b03a0339814fe903c55a3470000000000000000000000000000000000000000000000000000011e61b68c00');
     expect(result.current.batches[0].batches[0].transactions[0].value).toBe(undefined);
+    expect(result.current.batches[0].batches[0].transactions[1].data).toBe('0xa9059cbb0000000000000000000000007f30b1960d5556929b03a0339814fe903c55a3470000000000000000000000000000000000000000000000000000011e61b68c00');
   });
 })
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@etherspot/transaction-kit",
   "description": "React Etherspot Transaction Kit",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "main": "dist/cjs/index.js",
   "scripts": {
     "rollup:build": "NODE_OPTIONS=--max-old-space-size=8192 rollup -c",

diff --git a/src/components/EtherspotApprovalTransaction.tsx b/src/components/EtherspotApprovalTransaction.tsx
@@ -28,8 +28,9 @@ const EtherspotApprovalTransaction = ({
   value,
   tokenAddress,
   receiverAddress,
-  id: transactionId
-}: EtherspotApprovalTransactionProps) => {
+  id: transactionId,
+  tokenDecimals = 18,
+}: EtherspotApprovalTransactionProps): React.ReactNode => {
   const context = useContext(EtherspotBatchContext);
   const componentId = useId();
 
@@ -40,7 +41,7 @@ const EtherspotApprovalTransaction = ({
   let valueBN;
   try {
     valueBN = typeof value === 'string' && !ethers.BigNumber.isBigNumber(value)
-      ? ethers.utils.parseEther(value)
+      ? ethers.utils.parseUnits(value, tokenDecimals)
       : value;
   } catch (e) {
     if (e instanceof Error && e?.message) {

diff --git a/src/components/EtherspotTokenTransferTransaction.tsx b/src/components/EtherspotTokenTransferTransaction.tsx
@@ -29,8 +29,9 @@ const EtherspotTokenTransferTransaction = ({
   value,
   tokenAddress,
   receiverAddress,
-  id: transactionId
-}: EtherspotTokenTransferTransactionProps): JSX.Element => {
+  id: transactionId,
+  tokenDecimals = 18,
+}: EtherspotTokenTransferTransactionProps): React.ReactNode => {
   const context = useContext(EtherspotBatchContext);
   const componentId = useId();
   const senderAddress = useWalletAddress('etherspot-prime', context?.chainId);
@@ -42,7 +43,7 @@ const EtherspotTokenTransferTransaction = ({
   let valueBN;
   try {
     valueBN = typeof value === 'string' && !ethers.BigNumber.isBigNumber(value)
-      ? ethers.utils.parseEther(value)
+      ? ethers.utils.parseUnits(value, tokenDecimals)
       : value;
   } catch (e) {
     if (e instanceof Error && e?.message) {

diff --git a/src/types/EtherspotTransactionKit.ts b/src/types/EtherspotTransactionKit.ts
@@ -66,6 +66,7 @@ export interface IEtherspotTokenTransferTransaction {
   value: BigNumberish;
   tokenAddress: string;
   receiverAddress: string;
+  tokenDecimals?: number;
 }
 
 export interface ISmartWalletAddress {
@@ -79,6 +80,7 @@ export interface IEtherspotApprovalTransaction {
   value: BigNumberish;
   tokenAddress: string;
   receiverAddress: string;
+  tokenDecimals?: number;
 }
 
 export interface ISameChainSwapOffers {