Merge pull request #110 from mintlayer/dev

Dev-17-02-2024-v-1-1-5

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",

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/",

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/",

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 ? (
                 <>

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,
@@ -44,6 +45,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)
@@ -62,6 +64,7 @@ const SendTransaction = ({
     setPassValidity(false)
     setPass('')
     setPassErrorMessage('')
+    // setTxErrorMessage('')
     setOpenSendFundConfirmation(state)
   }
 
@@ -90,14 +93,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)
+      if (e.address === '') {
+        // password is not correct
+        setPassErrorMessage('Incorrect password')
+        setPassPristinity(false)
+        setPassValidity(false)
+        setPass('')
+        setAllowClosing(true)
+      } else {
+        // handle other errors
+        setAskPassword(false)
+        setPassPristinity(false)
+        setPassValidity(false)
+        setPass('')
+        setTxErrorMessage(e.message)
+        setAllowClosing(true)
+        setPopupState(false)
+      }
     } finally {
       setSendingTransaction(false)
     }
@@ -230,12 +245,21 @@ const SendTransaction = ({
             totalFeeInCrypto={totalFeeCrypto}
           />
 
+          {/* TODO style error from transaction */}
           <FeesField
             feeChanged={feeChanged}
             value="norm"
             setFeeValidity={setFeeValidity}
           />
 
+          {txErrorMessage ? (
+            <>
+              <Error error={txErrorMessage} />
+            </>
+          ) : (
+            <></>
+          )}
+
           <CenteredLayout>
             <Button
               extraStyleClasses={['send-transaction-button']}
@@ -256,7 +280,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>
@@ -270,6 +294,7 @@ const SendTransaction = ({
                 fiatName={fiatName}
                 totalFeeFiat={totalFeeFiat}
                 totalFeeCrypto={totalFeeCrypto}
+                // txErrorMessage={txErrorMessage} // TODO move update on confirmation stage
                 fee={fee}
                 onConfirm={handleConfirm}
                 onCancel={handleCancel}

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

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) {

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)
 })

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
 }