From d31a2115b1bce498fe0029bf9d707cc0373a90e5 Mon Sep 17 00:00:00 2001
From: Kadir Sekha <sekhakadir@gmail.com>
Date: Fri, 26 Jan 2018 12:02:48 -0400
Subject: [PATCH] show currency warning on amount screen if plain address used

---
 src/js/controllers/amount.js    |  4 ++++
 src/js/routes.js                |  2 +-
 src/js/services/incomingData.js | 12 +++++++++++-
 www/views/amount.html           |  2 ++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index f7f895e3c..7a6912984 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -37,6 +37,10 @@ angular.module('copayApp.controllers').controller('amountController', function($
       $scope.fromWalletId = data.stateParams.fromWalletId;
     }
 
+    if (data.stateParams.noPrefix) {
+      $scope.showWarningMessage = data.stateParams.noPrefix != 0;
+    }
+
     var config = configService.getSync().wallet.settings;
 
     function setAvailableUnits() {
diff --git a/src/js/routes.js b/src/js/routes.js
index 93a409837..17069ba8d 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -287,7 +287,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
        */
 
       .state('tabs.send.amount', {
-        url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:coin/:fixedUnit/:fromWalletId/:minShapeshiftAmount/:maxShapeshiftAmount/:shapeshiftOrderId/:displayAddress',
+        url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:coin/:fixedUnit/:fromWalletId/:minShapeshiftAmount/:maxShapeshiftAmount/:shapeshiftOrderId/:displayAddress/:noPrefix',
         views: {
           'tab-send@tabs': {
             controller: 'amountController',
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index bc6b3f905..6c9d93c33 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -10,8 +10,16 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
 
   root.redir = function(data, shapeshiftData) {
     var originalAddress = null;
+    var noPrefixInAddress = 0;
+
+    if (data.toLowerCase().indexOf('bitcoin') < 0) {
+      noPrefixInAddress = 1;
+    }
+
     if (typeof(data) == 'string' && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) {
       try {
+        noPrefixInAddress = 0;
+
         if (data[0] == 'p' || data[0] == 'q') {
           data = 'bitcoincash:' + data;
         }
@@ -86,7 +94,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
           var params = {
             toAddress: addr,
             coin: coin,
-            displayAddress: originalAddress
+            displayAddress: originalAddress,
+            noPrefix: noPrefixInAddress
           };
           if (shapeshiftData) {
             params['fromWalletId'] = shapeshiftData.fromWalletId;
@@ -358,6 +367,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       $state.transitionTo('tabs.send.amount', {
         toAddress: toAddress,
         coin: coin,
+        noPrefix: 1
       });
     }, 100);
   }
diff --git a/www/views/amount.html b/www/views/amount.html
index 1d8b2ff5a..05f1929e2 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -30,6 +30,7 @@
     </div>
 
     <div ng-show="!isAndroid && !isIos" ng-class="{'amount-pane-recipient': !customAmount && !nextStep,'amount-pane-no-recipient': customAmount || nextStep}">
+      <span class="recipient-label" ng-if="showWarningMessage" translate>Note: Address doesn't contain currency information, please make sure you are sending the correct currency.</span>
       <div class="amount-bar oh">
         <div class="title">
           <span translate>Amount</span>
@@ -60,6 +61,7 @@
     </div>
 
     <div class="item" ng-show="isAndroid || isIos">
+      <span class="recipient-label" ng-if="showWarningMessage" translate>Note: Address doesn't contain currency information, please make sure you are sending the correct currency.</span><br/><br/>
       <span class="label" translate>Amount</span><br/>
       <div ng-if="shapeshiftOrderId">
         Minimum amount: {{minShapeshiftAmount}} <br/>