From 723ef507ce18cc7b323c1e34a5b93c0b82a75315 Mon Sep 17 00:00:00 2001
From: Tim Akinbo <takinbo@timbaobjects.com>
Date: Sun, 1 Jul 2018 15:52:14 +0000
Subject: [PATCH] fixes #5 by properly encoding the bitcoin URI

---
 src/modules/bip21Link.js    | 8 +++++---
 src/modules/paymentModal.js | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/bip21Link.js b/src/modules/bip21Link.js
index d43f072..b857cc9 100644
--- 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
index 34b49c5..09b7ea9 100644
--- 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',