diff --git a/src/app/utilsView/view.nim b/src/app/utilsView/view.nim
index 3986e09d09..8e8da0ebb2 100644
--- a/src/app/utilsView/view.nim
+++ b/src/app/utilsView/view.nim
@@ -1,4 +1,5 @@
 import NimQml, os, strformat, strutils, parseUtils
+import stint
 import ../../status/status
 import ../../status/stickers
 import ../../status/libstatus/accounts/constants as accountConstants
@@ -40,7 +41,8 @@ QtObject:
     result = getSNTBalance($currAcct.address)
 
   proc eth2Wei*(self: UtilsView, eth: string, decimals: int): string {.slot.} =
-    return $status_utils.eth2Wei(parseFloat(eth), decimals)
+    let uintValue = status_utils.eth2Wei(parseFloat(eth), decimals)
+    return uintValue.toString()
 
   proc wei2Token*(self: UtilsView, wei: string, decimals: int): string {.slot.} =
     return status_utils.wei2Token(wei, decimals)
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandsPopup.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandsPopup.qml
index 9b79a4f05f..ad06aff64b 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandsPopup.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandsPopup.qml
@@ -37,9 +37,9 @@ Popup {
     function requestTransaction(address, amount, tokenAddress, tokenDecimals = 18) {
         amount =  utilsModel.eth2Wei(amount.toString(), tokenDecimals)
         chatsModel.requestTransaction(chatsModel.activeChannel.id,
-                                        address,
-                                        amount,
-                                        tokenAddress)
+                                      address,
+                                      amount,
+                                      tokenAddress)
         chatCommandModal.close()
     }
 
diff --git a/ui/nim-status-client.pro b/ui/nim-status-client.pro
index ced3b61d6a..b5a99c8771 100644
--- a/ui/nim-status-client.pro
+++ b/ui/nim-status-client.pro
@@ -15,6 +15,7 @@ lupdate_only{
 SOURCES = *.qml \
           app/*.qml \
           shared/*.qml \
+          shared/status/*.qml \
           onboarding/*.qml \
           onboarding/Login/*.qml \
           app/AppLayouts/*.qml \
@@ -22,6 +23,7 @@ SOURCES = *.qml \
           app/AppLayouts/Chat/ChatColumn/*.qml \
           app/AppLayouts/Chat/ChatColumn/ChatComponents/*.qml \
           app/AppLayouts/Chat/ChatColumn/MessageComponents/*.qml \
+          app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/*.qml \
           app/AppLayouts/Chat/ContactsColumn/*.qml \
           app/AppLayouts/Chat/components/*.qml \
           app/AppLayouts/Node/*.qml \