diff --git a/components/Transaction/ui.tsx b/components/Transaction/ui.tsx
index a042ae4..eec1d62 100644
--- a/components/Transaction/ui.tsx
+++ b/components/Transaction/ui.tsx
@@ -280,7 +280,7 @@ export const TxUI: FC<UIProps> = ({
                         }}
                       />
                       <Input
-                        type="text"
+                        type="number"
                         value={tokenAmount.value}
                         placeholder="Value"
                         onChange={e => {
@@ -294,14 +294,9 @@ export const TxUI: FC<UIProps> = ({
                   ) : (
                     <Input
                       css={{ flex: 'inherit' }}
-                      type="text"
+                      type="number"
                       value={value}
                       onChange={e => handleSetField(field, e.target.value)}
-                      onKeyPress={e => {
-                        if (e.key === '.' || e.key === ',') {
-                          e.preventDefault()
-                        }
-                      }}
                     />
                   )}
                   <Box
diff --git a/utils/estimateFee.ts b/utils/estimateFee.ts
index b4de7d1..4ba96d4 100644
--- a/utils/estimateFee.ts
+++ b/utils/estimateFee.ts
@@ -31,7 +31,8 @@ const estimateFee = async (
   } catch (err) {
     if (!opts.silent) {
       console.error(err)
-      toast.error('Cannot estimate fee.') // ? Some better msg
+      const msg = err instanceof Error ? err.message : 'Error estimating fee!';
+      toast.error(msg);
     }
     return null
   }