Use decoding in a single place on scan

iamonuwa · Jul 16, 2019 · 9d7784c · 9d7784c
1 parent 6159aa9
commit 9d7784c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/components/SendByScan.js b/src/components/SendByScan.js
@@ -111,7 +111,7 @@ class SendByScan extends Component {
             amount: parseFloat(dataSplit[1], 10)
           }
           if (dataSplit.length > 1) {
-            returnState.message = dataSplit[2]
+            returnState.message = decodeURI(dataSplit[2])
           }
           if (dataSplit.length > 2) {
             returnState.currency = dataSplit[3]

diff --git a/src/components/SendToAddress.js b/src/components/SendToAddress.js
@@ -24,6 +24,7 @@ export default class SendToAddress extends React.Component {
     if (props.scannerState) {
       const {
         scannerState: {
+          message,
           extraMessage,
           toAddress,
         },
@@ -32,7 +33,7 @@ export default class SendToAddress extends React.Component {
       } = props;
 
 
-      let { scannerState: { amount, currency, message } } = props;
+      let { scannerState: { amount, currency } } = props;
       let currencyWarning = false;
       let requestedAmount = 0;
 
@@ -55,7 +56,6 @@ export default class SendToAddress extends React.Component {
                   .toFixed(2);
         currencyWarning = true;
       }
-      message = decodeURI(message);
 
       initialState = {
         amount,
@@ -104,12 +104,9 @@ export default class SendToAddress extends React.Component {
 
   componentWillReceiveProps(newProps) {
     if (this.props.scannerState !== newProps.scannerState) {
-        const { message,...rest } = newProps.scannerState;
-
-        this.setState({
+       this.setState({
           ...this.state,
-          ...rest,
-          message: decodeURI(message)
+          ...newProps.scannerState
         })
     }
   }