Merge pull request #6 from takinbo/master

fixes #5 by properly encoding the bitcoin URI
alexk111 · Jul 2, 2018 · 8b53d5d · 8b53d5d
2 parents beb3156 + 723ef50
commit 8b53d5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/modules/bip21Link.js b/src/modules/bip21Link.js
@@ -6,9 +6,11 @@
 // bitcoincash:<address>[?amount=<amount>][?label=<label>][?message=<message>]
 
 export function encodeBip21Link (isBCH, address, amount, label, message) {
+  const parts = []
+  if (amount) parts.push('amount=' + encodeURIComponent(amount))
+  if (label) parts.push('label=' + encodeURIComponent(label))
+  if (message) parts.push('message=' + encodeURIComponent(message))
   return (isBCH ? 'bitcoincash' : 'bitcoin') + ':' + address +
-          (amount ? '?amount=' + encodeURIComponent(amount) : '') +
-          (label ? '?label=' + encodeURIComponent(label) : '') +
-          (message ? '?message=' + encodeURIComponent(message) : '')
+          (parts ? '?' + parts.join('&') : '')
 }
 
diff --git a/src/modules/paymentModal.js b/src/modules/paymentModal.js
@@ -7,7 +7,7 @@ import qrcode from 'qrcode-generator'
 const paymentFormLabels = {
   'currency': 'Currency',
   'requiredFeeRate': 'Fee Rate (sats/byte)',
-  'time': 'Creaated at',
+  'time': 'Created at',
   'expires': 'Expires at',
   'memo': 'Memo',
   'amountBTC': 'Amount',