edge-currency-monero 1.3.1 → 1.3.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 # Unreleased
 
+# 1.3.2 (2024-11-19)
+
+- fixed: URI parsing and creation according to the correct format
+
 # 1.3.1 (2024-03-21)
 
 - fixed: Include missing files in the NPM package.

package/lib/MoneroTools.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _biggystring = require('biggystring');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }var _biggystring = require('biggystring');
 
 
 
@@ -115,7 +115,10 @@ function getParameterByName(param, url) {
       throw new Error('InvalidPublicAddressError')
     }
 
-    const amountStr = getParameterByName('amount', uri)
+    // Prioritize the correct Monero URI format, while falling back to BIP21
+    // formats.
+    const amountStr =
+      _nullishCoalesce(getParameterByName('tx_amount', uri), () => ( getParameterByName('amount', uri)))
     if (amountStr != null) {
       const denom = getDenomInfo('XMR')
       if (denom == null) {
@@ -126,8 +129,12 @@ function getParameterByName(param, url) {
       currencyCode = 'XMR'
     }
     const uniqueIdentifier = getParameterByName('tx_payment_id', uri)
-    const label = getParameterByName('label', uri)
-    const message = getParameterByName('message', uri)
+    const label =
+      _nullishCoalesce(getParameterByName('recipient_name', uri), () => (
+      getParameterByName('label', uri)))
+    const message =
+      _nullishCoalesce(getParameterByName('tx_description', uri), () => (
+      getParameterByName('message', uri)))
     const category = getParameterByName('category', uri)
 
     const edgeParsedUri = {
@@ -184,13 +191,13 @@ function getParameterByName(param, url) {
         }
         const amount = _biggystring.div.call(void 0, nativeAmount, denom.multiplier, 12)
 
-        queryString += 'amount=' + amount + '&'
+        queryString += 'tx_amount=' + amount + '&'
       }
       if (typeof obj.label === 'string') {
-        queryString += 'label=' + obj.label + '&'
+        queryString += 'recipient_name=' + obj.label + '&'
       }
       if (typeof obj.message === 'string') {
-        queryString += 'message=' + obj.message + '&'
+        queryString += 'tx_description=' + obj.message + '&'
       }
       queryString = queryString.substr(0, queryString.length - 1)
 

package/lib/react-native/edge-currency-monero.ts

@@ -3460,6 +3460,8 @@ var MoneroTools = /*#__PURE__*/function () {
     key: "parseUri",
     value: function () {
       var _parseUri = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(uri) {
+        var _getParameterByName, _getParameterByName2, _getParameterByName3;
+
         var parsedUri, address, nativeAmount, currencyCode, amountStr, denom, uniqueIdentifier, label, message, category, edgeParsedUri;
         return regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
@@ -3514,7 +3516,9 @@ var MoneroTools = /*#__PURE__*/function () {
                 throw new Error('InvalidPublicAddressError');
 
               case 21:
-                amountStr = getParameterByName('amount', uri);
+                // Prioritize the correct Monero URI format, while falling back to BIP21
+                // formats.
+                amountStr = (_getParameterByName = getParameterByName('tx_amount', uri)) !== null && _getParameterByName !== void 0 ? _getParameterByName : getParameterByName('amount', uri);
 
                 if (!(amountStr != null)) {
                   _context3.next = 29;
@@ -3537,8 +3541,8 @@ var MoneroTools = /*#__PURE__*/function () {
 
               case 29:
                 uniqueIdentifier = getParameterByName('tx_payment_id', uri);
-                label = getParameterByName('label', uri);
-                message = getParameterByName('message', uri);
+                label = (_getParameterByName2 = getParameterByName('recipient_name', uri)) !== null && _getParameterByName2 !== void 0 ? _getParameterByName2 : getParameterByName('label', uri);
+                message = (_getParameterByName3 = getParameterByName('tx_description', uri)) !== null && _getParameterByName3 !== void 0 ? _getParameterByName3 : getParameterByName('message', uri);
                 category = getParameterByName('category', uri);
                 edgeParsedUri = {
                   publicAddress: address
@@ -3647,15 +3651,15 @@ var MoneroTools = /*#__PURE__*/function () {
 
               case 21:
                 amount = (0,biggystring__WEBPACK_IMPORTED_MODULE_0__.div)(nativeAmount, denom.multiplier, 12);
-                queryString += 'amount=' + amount + '&';
+                queryString += 'tx_amount=' + amount + '&';
 
               case 23:
                 if (typeof obj.label === 'string') {
-                  queryString += 'label=' + obj.label + '&';
+                  queryString += 'recipient_name=' + obj.label + '&';
                 }
 
                 if (typeof obj.message === 'string') {
-                  queryString += 'message=' + obj.message + '&';
+                  queryString += 'tx_description=' + obj.message + '&';
                 }
 
                 queryString = queryString.substr(0, queryString.length - 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-monero",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Edge Monero currency plugin",
   "homepage": "https://edge.app",
   "repository": {