feat: compilation works with 0.18.0

apps/extension/src/background/keyring/handler.ts

@@ -300,8 +300,8 @@ const handleTransferCompletedEvent: (
   service: KeyRingService
 ) => InternalHandler<TransferCompletedEvent> = (service) => {
   return async (_, msg) => {
-    const { msgId, success } = msg;
-    return await service.handleTransferCompleted(msgId, success);
+    const { msgId, success, payload } = msg;
+    return await service.handleTransferCompleted(msgId, success, payload);
   };
 };
 

apps/extension/src/background/keyring/messages.ts

@@ -384,7 +384,11 @@ export class TransferCompletedEvent extends Message<void> {
     return MessageType.TransferCompletedEvent;
   }
 
-  constructor(public readonly success: boolean, public readonly msgId: string) {
+  constructor(
+    public readonly success: boolean,
+    public readonly msgId: string,
+    public readonly payload?: string
+  ) {
     super();
   }
 

apps/extension/src/background/keyring/service.ts

@@ -294,8 +294,14 @@ export class KeyRingService {
 
   async handleTransferCompleted(
     msgId: string,
-    success: boolean
+    success: boolean,
+    payload?: string
   ): Promise<void> {
+    if (!success) {
+      //TODO: pass error message to the TransferStartedEvent and display it in the UI
+      console.error(payload);
+    }
+
     const tabs = await syncTabs(
       this.connectedTabsStore,
       this.requester,

apps/extension/src/background/offscreen/offscreen.ts

@@ -33,12 +33,13 @@ const SW_TTL = 20000;
 
     const transferCompletedHandler = async (
       msgId: string,
-      success: boolean
+      success: boolean,
+      payload?: string
     ): Promise<void> => {
       // We are sending the message to the background script
       await requester.sendMessage(
         Ports.Background,
-        new TransferCompletedEvent(success, msgId)
+        new TransferCompletedEvent(success, msgId, payload)
       );
 
       // Reducing a number of tracked web workers

apps/extension/src/background/web-workers/index.ts

@@ -8,17 +8,26 @@ import {
 
 export const init = (
   data: SubmitTransferMessageData,
-  transferCompletedHandler: (msgId: string, success: boolean) => Promise<void>
+  transferCompletedHandler: (
+    msgId: string,
+    success: boolean,
+    payload?: string
+  ) => Promise<void>
 ): void => {
   const w = new Worker("submit-transfer-web-worker.anoma.js");
 
   w.onmessage = (e: MessageEvent<Msg>) => {
-    if (e.data === INIT_MSG) {
+    const { msgName, payload } = e.data;
+    if (msgName === INIT_MSG) {
       w.postMessage(data);
-    } else if (e.data === TRANSFER_SUCCESSFUL_MSG) {
-      transferCompletedHandler(data.msgId, true).then(() => w.terminate());
-    } else if (e.data === TRANSFER_FAILED_MSG) {
-      transferCompletedHandler(data.msgId, false).then(() => w.terminate());
+    } else if (msgName === TRANSFER_SUCCESSFUL_MSG) {
+      transferCompletedHandler(data.msgId, true, payload).then(() =>
+        w.terminate()
+      );
+    } else if (msgName === TRANSFER_FAILED_MSG) {
+      transferCompletedHandler(data.msgId, false, payload).then(() =>
+        w.terminate()
+      );
     } else {
       console.warn("Not supporeted msg type.");
     }

apps/extension/src/background/web-workers/submit-transfer-web-worker.ts

@@ -36,11 +36,16 @@ import {
     ({ data }: { data: SubmitTransferMessageData }) => {
       sdk
         .submit_transfer(fromBase64(data.txMsg), data.password, data.xsk)
-        .then(() => postMessage(TRANSFER_SUCCESSFUL_MSG))
-        .catch(() => postMessage(TRANSFER_FAILED_MSG));
+        .then(() => postMessage({ msgName: TRANSFER_SUCCESSFUL_MSG }))
+        .catch((error) => {
+          postMessage({
+            msgName: TRANSFER_FAILED_MSG,
+            payload: error.message,
+          });
+        });
     },
     false
   );
 
-  postMessage(INIT_MSG);
+  postMessage({ msgName: INIT_MSG });
 })();

apps/extension/src/background/web-workers/types.ts

@@ -15,7 +15,9 @@ export type SubmitTransferMessageData = {
 export const INIT_MSG = "init";
 export const TRANSFER_SUCCESSFUL_MSG = "transfer-successful";
 export const TRANSFER_FAILED_MSG = "transfer-failed";
-export type Msg =
+export type MsgName =
   | typeof INIT_MSG
   | typeof TRANSFER_FAILED_MSG
   | typeof TRANSFER_SUCCESSFUL_MSG;
+
+export type Msg = { msgName: MsgName; payload?: string };

apps/namada-interface/src/slices/transfers.ts

@@ -2,7 +2,6 @@ import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
 import BigNumber from "bignumber.js";
 
 import { Account, Tokens, TokenType, Signer } from "@anoma/types";
-import { amountToMicro } from "@anoma/utils";
 import { getIntegration } from "@anoma/hooks";
 
 import {
@@ -166,7 +165,7 @@ export const submitTransferTransaction = createAsyncThunk<
       source: txTransferArgs.account.address,
       target: txTransferArgs.target,
       token: Tokens.NAM.address || "",
-      amount: amountToMicro(txTransferArgs.amount),
+      amount: txTransferArgs.amount,
       nativeToken: Tokens.NAM.address || "",
     });
   }
@@ -242,8 +241,7 @@ export const submitBridgeTransferTransaction = createAsyncThunk<
         source: txBridgeTransferArgs.account.address,
         target: txBridgeTransferArgs.target,
         token: txBridgeTransferArgs.token,
-        // TODO: Check to see if amountToMicro is needed here once implemented for ETH Bridge:
-        amount: amountToMicro(txBridgeTransferArgs.amount),
+        amount: txBridgeTransferArgs.amount,
       },
     });