Merge pull request #21 from CudoVentures/cudos-dev

Cudos dev
cudoventures · Jun 7, 2022 · 2bab99b · 2bab99b
2 parents a0c0583 + 8107d8c
commit 2bab99b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/frontend/resources/common/js/components-popups/PreFlightModal.tsx b/src/frontend/resources/common/js/components-popups/PreFlightModal.tsx
@@ -42,7 +42,7 @@ const PreFlightModal = ({
                     <ul>
                         <li>You will not be able to cancel the transaction once you submit it.</li>
                         <li>Your transaction could get stuck for an indefinite amount of time.</li>
-                        <li>Funds canot be returned if they are sent to the wrong address.</li>
+                        <li>Funds cannot be returned if they are sent to the wrong address.</li>
                     </ul>
                 </div>
                 <div className={'transactionMessage'}>

diff --git a/src/frontend/resources/common/js/models/ledgers/KeplrLedger.ts b/src/frontend/resources/common/js/models/ledgers/KeplrLedger.ts
@@ -193,7 +193,7 @@ export default class KeplrLedger implements Ledger {
                     denom: CosmosNetworkH.CURRENCY_DENOM,
                 },
                 bridgeFee: {
-                    amount: this.bridgeFee.toString(),
+                    amount: this.bridgeFee.toString(10),
                     denom: CosmosNetworkH.CURRENCY_DENOM,
                 },
             },

diff --git a/src/frontend/resources/common/js/models/ledgers/MetamaskLedger.ts b/src/frontend/resources/common/js/models/ledgers/MetamaskLedger.ts
@@ -85,7 +85,6 @@ export default class MetamaskLedger implements Ledger {
                 erc20Instance.methods.approve(Config.ORCHESTRATOR.BRIDGE_CONTRACT_ADDRESS, stringAmount)
                     .send({ from: account },
                         (err, transactionHash) => {
-                            this.txHash = transactionHash;
                             if (err) {
                                 reject(err);
 
@@ -96,7 +95,7 @@ export default class MetamaskLedger implements Ledger {
                             gravityContract.methods.sendToCosmos(Config.ORCHESTRATOR.ERC20_CONTRACT_ADDRESS, `0x${toHex(addressBytes32Array)}`, stringAmount).send({ from: account, gas: this.gas })
                                 .on('receipt', (confirmationNumber, receipt) => {
                                     resolve();
-                                    // console.log('receipt', confirmationNumber);
+                                    this.txHash = confirmationNumber.transactionHash;
                                 })
                                 .on('error', (e) => {
                                     reject();