From 754a8180b24997c85e7cd835e2619307226905a7 Mon Sep 17 00:00:00 2001
From: Sergey Chystiakov <anyxem@gmail.com>
Date: Thu, 15 Feb 2024 17:55:14 +0100
Subject: [PATCH 1/7] fix: feerate error handling

---
 .../SendTransaction/SendTransaction.js        | 26 ++++++++++++++-----
 .../SendTransactionConfirmation.js            |  7 +++--
 src/services/API/Mintlayer/Mintlayer.js       | 19 +++++++++++++-
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/components/containers/SendTransaction/SendTransaction.js b/src/components/containers/SendTransaction/SendTransaction.js
index ad5623bd..0997d6b6 100644
--- a/src/components/containers/SendTransaction/SendTransaction.js
+++ b/src/components/containers/SendTransaction/SendTransaction.js
@@ -44,6 +44,7 @@ const SendTransaction = ({
   const [passValidity, setPassValidity] = useState(false)
   const [passPristinity, setPassPristinity] = useState(true)
   const [passErrorMessage, setPassErrorMessage] = useState('')
+  const [txErrorMessage, setTxErrorMessage] = useState('')
   const [sendingTransaction, setSendingTransaction] = useState(false)
   const [transactionTxid, setTransactionTxid] = useState(false)
   const [allowClosing, setAllowClosing] = useState(true)
@@ -90,14 +91,26 @@ const SendTransaction = ({
       setTransactionTxid(txid)
       setPassValidity(true)
       setPassErrorMessage('')
+      setTxErrorMessage('')
       setAskPassword(false)
     } catch (e) {
-      console.error(e)
-      setPassPristinity(false)
-      setPassValidity(false)
-      setPass('')
-      setPassErrorMessage('Incorrect password. Account could not be unlocked')
-      setAllowClosing(true)
+      console.log('=========000========')
+      if (e.address && e.address === '') {
+        // password is not correct
+        setPassErrorMessage('Incorrect password. Account could not be unlocked')
+        setPassPristinity(false)
+        setPassValidity(false)
+        setPass('')
+        setAllowClosing(true)
+      } else {
+        // handle other errors
+        setAskPassword(false)
+        setPassPristinity(false)
+        setPassValidity(false)
+        setPass('')
+        setTxErrorMessage(e.message)
+        setAllowClosing(true)
+      }
     } finally {
       setSendingTransaction(false)
     }
@@ -270,6 +283,7 @@ const SendTransaction = ({
                 fiatName={fiatName}
                 totalFeeFiat={totalFeeFiat}
                 totalFeeCrypto={totalFeeCrypto}
+                txErrorMessage={txErrorMessage}
                 fee={fee}
                 onConfirm={handleConfirm}
                 onCancel={handleCancel}
diff --git a/src/components/containers/SendTransaction/SendTransactionConfirmation.js b/src/components/containers/SendTransaction/SendTransactionConfirmation.js
index 184d5474..13155023 100644
--- a/src/components/containers/SendTransaction/SendTransactionConfirmation.js
+++ b/src/components/containers/SendTransaction/SendTransactionConfirmation.js
@@ -1,5 +1,5 @@
-import { useContext } from 'react'
-import { Button } from '@BasicComponents'
+import React, { useContext } from 'react'
+import { Button, Error } from '@BasicComponents'
 import { CenteredLayout, VerticalGroup } from '@LayoutComponents'
 import { AccountContext, SettingsContext } from '@Contexts'
 import { AppInfo } from '@Constants'
@@ -12,6 +12,7 @@ const SendFundConfirmation = ({
   amountInCrypto,
   cryptoName,
   fiatName,
+  txErrorMessage,
   totalFeeFiat,
   totalFeeCrypto,
   fee,
@@ -62,6 +63,8 @@ const SendFundConfirmation = ({
       </dl>
 
       <VerticalGroup>
+        {txErrorMessage ? <Error error={txErrorMessage} /> : <></>}
+
         <Button onClickHandle={onConfirm}>Confirm</Button>
         <Button
           dark
diff --git a/src/services/API/Mintlayer/Mintlayer.js b/src/services/API/Mintlayer/Mintlayer.js
index a4da0f0a..c2b2b780 100644
--- a/src/services/API/Mintlayer/Mintlayer.js
+++ b/src/services/API/Mintlayer/Mintlayer.js
@@ -17,7 +17,24 @@ const requestMintlayer = async (url, body = null, request = fetch) => {
 
   try {
     const result = await request(url, { method, body })
-    if (!result.ok) throw new Error('Request not successful')
+    if (!result.ok) {
+      const error = await result.json()
+      if (error.error === 'Address not found') {
+        return Promise.resolve(
+          JSON.stringify({ coin_balance: 0, transaction_history: [] }),
+        )
+      }
+
+      // handle RPC error
+      if (error.error.includes('Mempool error:')) {
+        const errorMessage = error.error
+          .split('Mempool error: ')[1]
+          .split('(')[0]
+        throw new Error(errorMessage)
+      }
+
+      throw new Error('Request not successful')
+    }
     const content = await result.text()
     return Promise.resolve(content)
   } catch (error) {

From 03356bacc3ebe671470f696c330e792efb99a7eb Mon Sep 17 00:00:00 2001
From: Sergey Chystiakov <anyxem@gmail.com>
Date: Fri, 16 Feb 2024 12:25:00 +0100
Subject: [PATCH 2/7] update messages and redirect to send page

---
 .../SendTransaction/SendTransaction.js         | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/containers/SendTransaction/SendTransaction.js b/src/components/containers/SendTransaction/SendTransaction.js
index 0997d6b6..a795b9d1 100644
--- a/src/components/containers/SendTransaction/SendTransaction.js
+++ b/src/components/containers/SendTransaction/SendTransaction.js
@@ -63,6 +63,7 @@ const SendTransaction = ({
     setPassValidity(false)
     setPass('')
     setPassErrorMessage('')
+    // setTxErrorMessage('')
     setOpenSendFundConfirmation(state)
   }
 
@@ -94,10 +95,9 @@ const SendTransaction = ({
       setTxErrorMessage('')
       setAskPassword(false)
     } catch (e) {
-      console.log('=========000========')
-      if (e.address && e.address === '') {
+      if (e.address === '') {
         // password is not correct
-        setPassErrorMessage('Incorrect password. Account could not be unlocked')
+        setPassErrorMessage('Incorrect password')
         setPassPristinity(false)
         setPassValidity(false)
         setPass('')
@@ -110,6 +110,7 @@ const SendTransaction = ({
         setPass('')
         setTxErrorMessage(e.message)
         setAllowClosing(true)
+        setPopupState(false)
       }
     } finally {
       setSendingTransaction(false)
@@ -247,8 +248,15 @@ const SendTransaction = ({
             feeChanged={feeChanged}
             value="norm"
             setFeeValidity={setFeeValidity}
+            errorMessage={txErrorMessage}
           />
 
+          {txErrorMessage ? (
+            <p align="center">Try to send again with new fees</p>
+          ) : (
+            <></>
+          )}
+
           <CenteredLayout>
             <Button
               extraStyleClasses={['send-transaction-button']}
@@ -269,7 +277,7 @@ const SendTransaction = ({
           {!transactionTxid ? (
             sendingTransaction ? (
               <VerticalGroup bigGap>
-                <h2>Your transaction is being created and sent.</h2>
+                <h2>Your transaction broadcasting to network.</h2>
                 <div className="loading-center">
                   <Loading />
                 </div>
@@ -283,7 +291,7 @@ const SendTransaction = ({
                 fiatName={fiatName}
                 totalFeeFiat={totalFeeFiat}
                 totalFeeCrypto={totalFeeCrypto}
-                txErrorMessage={txErrorMessage}
+                // txErrorMessage={txErrorMessage} // TODO move update on confirmation stage
                 fee={fee}
                 onConfirm={handleConfirm}
                 onCancel={handleCancel}

From b353d6f4223b9fdb44abfe9182bcb4a35afe1a87 Mon Sep 17 00:00:00 2001
From: owlsua <allatsnow@gmail.com>
Date: Fri, 16 Feb 2024 14:34:44 +0100
Subject: [PATCH 3/7] fix: prevent page refresh when pressing Enter during
 login

---
 src/components/containers/Login/SetPassword.js | 2 +-
 src/services/API/Mintlayer/Mintlayer.test.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/containers/Login/SetPassword.js b/src/components/containers/Login/SetPassword.js
index 8871fe0c..62c5a345 100644
--- a/src/components/containers/Login/SetPassword.js
+++ b/src/components/containers/Login/SetPassword.js
@@ -61,7 +61,7 @@ const SetPassword = ({ onChangePassword, onSubmit, checkPassword }) => {
       <Header />
       <div className="content">
         <CenteredLayout>
-          <form>
+          <form onSubmit={doLogin}>
             <VerticalGroup bigGap>
               {!unlockingAccount ? (
                 <>
diff --git a/src/services/API/Mintlayer/Mintlayer.test.js b/src/services/API/Mintlayer/Mintlayer.test.js
index 089a15e2..4e7f8f09 100644
--- a/src/services/API/Mintlayer/Mintlayer.test.js
+++ b/src/services/API/Mintlayer/Mintlayer.test.js
@@ -69,7 +69,7 @@ const FIRST_TX_ID =
 test('getAddressData', async () => {
   const result = await getAddressData(TESTNET_WALLET)
   const data = JSON.parse(result)
-  expect(data.coin_balance).toBeGreaterThan(0)
+  expect(Number(data.coin_balance)).toBeGreaterThan(0)
   const firstTransactionId =
     data.transaction_history[data.transaction_history.length - 1]
   expect(data.transaction_history.length).toBeGreaterThan(0)
@@ -95,5 +95,5 @@ test('Mintlayer API request - getAdressTransactions', async () => {
 
 test('Mintlayer API request - getAddressBalance', async () => {
   const result = await getAddressBalance(TESTNET_WALLET)
-  expect(result.balanceInAtoms).toBeGreaterThan(0)
+  expect(Number(result.balanceInAtoms)).toBeGreaterThan(0)
 })

From 2087f166dfb101851fa3c77c2265a91cbd24d7e7 Mon Sep 17 00:00:00 2001
From: Sergey Chystiakov <anyxem@gmail.com>
Date: Fri, 16 Feb 2024 15:34:32 +0100
Subject: [PATCH 4/7] add todo

---
 src/components/containers/SendTransaction/SendTransaction.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/containers/SendTransaction/SendTransaction.js b/src/components/containers/SendTransaction/SendTransaction.js
index a795b9d1..6ee8c80c 100644
--- a/src/components/containers/SendTransaction/SendTransaction.js
+++ b/src/components/containers/SendTransaction/SendTransaction.js
@@ -244,6 +244,7 @@ const SendTransaction = ({
             totalFeeInCrypto={totalFeeCrypto}
           />
 
+          {/* TODO style error from transaction */}
           <FeesField
             feeChanged={feeChanged}
             value="norm"

From b6acad62095090bce8c9a637013dc758013053aa Mon Sep 17 00:00:00 2001
From: Sergey Chystiakov <anyxem@gmail.com>
Date: Fri, 16 Feb 2024 15:38:59 +0100
Subject: [PATCH 5/7] remove note

---
 .../containers/SendTransaction/SendTransaction.js           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/containers/SendTransaction/SendTransaction.js b/src/components/containers/SendTransaction/SendTransaction.js
index 6ee8c80c..83512211 100644
--- a/src/components/containers/SendTransaction/SendTransaction.js
+++ b/src/components/containers/SendTransaction/SendTransaction.js
@@ -13,6 +13,7 @@ import AmountField from './AmountField'
 import FeesField from './FeesField'
 
 import './SendTransaction.css'
+import { Error } from '@BasicComponents'
 
 const SendTransaction = ({
   totalFeeFiat: totalFeeFiatParent,
@@ -249,11 +250,12 @@ const SendTransaction = ({
             feeChanged={feeChanged}
             value="norm"
             setFeeValidity={setFeeValidity}
-            errorMessage={txErrorMessage}
           />
 
           {txErrorMessage ? (
-            <p align="center">Try to send again with new fees</p>
+            <>
+              <Error error={txErrorMessage} />
+            </>
           ) : (
             <></>
           )}

From d84039a3efca228c31ad952fb91ea4cdccb209aa Mon Sep 17 00:00:00 2001
From: Sergey Chystiakov <anyxem@gmail.com>
Date: Sat, 17 Feb 2024 15:22:59 +0100
Subject: [PATCH 6/7] found fee

---
 src/utils/Helpers/ML/MLTransaction.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/Helpers/ML/MLTransaction.js b/src/utils/Helpers/ML/MLTransaction.js
index bbbcead5..1d6fea09 100644
--- a/src/utils/Helpers/ML/MLTransaction.js
+++ b/src/utils/Helpers/ML/MLTransaction.js
@@ -197,7 +197,7 @@ const calculateFee = async (
   )
   const feeEstimatesResponse = await Mintlayer.getFeesEstimates()
   const feeEstimates = JSON.parse(feeEstimatesResponse)
-  const fee = (Number(feeEstimates) / 1000) * size
+  const fee = Math.ceil((Number(feeEstimates) / 1000) * size)
 
   return fee
 }

From 3edbc57d84f9399806ae78e54d91ba523d0f4b93 Mon Sep 17 00:00:00 2001
From: owlsua <allatsnow@gmail.com>
Date: Sat, 17 Feb 2024 19:40:23 +0100
Subject: [PATCH 7/7] update: increase version to 1.1.5

---
 package-lock.json           | 4 ++--
 package.json                | 2 +-
 public/manifestDefault.json | 2 +-
 public/manifestFirefox.json | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2c22b2ed..aaabdc9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "browser-extension",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "browser-extension",
-      "version": "1.1.4",
+      "version": "1.1.5",
       "dependencies": {
         "@mintlayer/entropy-generator": "^1.0.2",
         "@testing-library/jest-dom": "^6.1.4",
diff --git a/package.json b/package.json
index e5eaea4d..fa8fe0ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browser-extension",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "private": true,
   "dependencies": {
     "@mintlayer/entropy-generator": "^1.0.2",
diff --git a/public/manifestDefault.json b/public/manifestDefault.json
index cba521ba..332d529a 100644
--- a/public/manifestDefault.json
+++ b/public/manifestDefault.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Mojito - A Mintlayer Wallet",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "short_name": "Mojito",
   "description": "Mojito is a non-custodial decentralized crypto wallet that lets you send and receive BTC and ML from any other address.",
   "homepage_url": "https://www.mintlayer.org/",
diff --git a/public/manifestFirefox.json b/public/manifestFirefox.json
index 689eac3c..3c62a21f 100644
--- a/public/manifestFirefox.json
+++ b/public/manifestFirefox.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Mojito - A Mintlayer Wallet",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "short_name": "Mojito",
   "description": "Mojito is a non-custodial decentralized crypto wallet that lets you send and receive BTC and ML from any other address.",
   "homepage_url": "https://www.mintlayer.org/",