Merge pull request #169 from mintlayer/dev

dev-23-06-2024

Author: owlsua

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "private": true,
   "dependencies": {
     "@mintlayer/entropy-generator": "^1.0.2",

package.json

@@ -50,7 +50,10 @@ browser.runtime.onConnect.addListener((port) => {
         setTimeout(async () => {
           await browser.runtime.sendMessage({
             action: 'createDelegate',
-            data: { pool_id: request.myProperty.message.pool_id },
+            data: {
+              pool_id: request.myProperty.message.pool_id,
+              referral_code: request.myProperty.message.referral_code || '',
+            },
           })
         }, 1000)
       })

public/background-script.js

@@ -63,7 +63,10 @@ chrome.runtime.onMessageExternal.addListener(function (
               setTimeout(function () {
                 chrome.runtime.sendMessage({
                   action: 'createDelegate',
-                  data: { pool_id: request.pool_id },
+                  data: {
+                    pool_id: request.pool_id,
+                    referral_code: request.referral_code || '',
+                  },
                 })
               }, 1000)
             },

public/background.js

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Mojito - A Mintlayer Wallet",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "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/manifestDefault.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Mojito - A Mintlayer Wallet",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "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/",
   "icons": {

public/manifestFirefox.json

@@ -263,6 +263,20 @@ const SendTransaction = ({
     [fee, amountInCrypto],
   )
 
+  useEffect(
+    () => {
+      if (preEnterAddress) {
+        calculateTotalFee({
+          to: preEnterAddress,
+          amount: NumbersHelper.floatStringToNumber(amountInCrypto),
+          fee,
+        })
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [isFormValid, amountInCrypto, fee, preEnterAddress],
+  )
+
   useEffect(() => {
     const validity = originalAmount && AppInfo.amountRegex.test(originalAmount)
     const maxValue = BTC.convertBtcToSatoshi(

src/components/containers/SendTransaction/SendTransaction.js

@@ -103,6 +103,7 @@ const Delegation = ({ delegation }) => {
           ></div>
           <div
             style={{
+              left: '30px',
               position: 'absolute',
               top: '50%',
               marginTop: '-38px',

src/components/containers/Wallet/Delegation.js

@@ -104,13 +104,18 @@ const App = () => {
               state: {
                 action: 'createDelegate',
                 pool_id: request.data.pool_id,
+                referral_code: request.data.referral_code || '',
               },
             })
             return
           }
           // change route to staking page
           navigate('/wallet/Mintlayer/staking/create-delegation', {
-            state: { action: 'createDelegate', pool_id: request.data.pool_id },
+            state: {
+              action: 'createDelegate',
+              pool_id: request.data.pool_id,
+              referral_code: request.data.referral_code || '',
+            },
           })
         }
 

src/index.js

@@ -7,5 +7,9 @@
   justify-content: center;
   align-items: center;
   height: 100%;
+  width: 100%;
   min-height: 400px;
+  position: absolute;
+  z-index: 40;
+  background-color: rgba(255, 255, 255, 0.8);
 }