diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 7b19c87d8..925cb6159 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -30,7 +30,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
       $scope.minShapeshiftAmount = parseFloat(data.stateParams.minShapeshiftAmount);
       $scope.maxShapeshiftAmount = parseFloat(data.stateParams.maxShapeshiftAmount);
       $scope.shapeshiftOrderId = data.stateParams.shapeshiftOrderId;
-      console.log($scope.shapeshiftOrderId);
+      //console.log($scope.shapeshiftOrderId);
     }
 
     var config = configService.getSync().wallet.settings;
@@ -320,9 +320,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
     var formatedValue = format($scope.amount);
     var result = evaluate(formatedValue);
     $scope.allowSend = lodash.isNumber(result) && +result > 0
-        && ((!$scope.minShapeshiftAmount && !$scope.maxShapeshiftAmount)
-            || ($scope.minShapeshiftAmount && $scope.maxShapeshiftAmount
-                && result >= $scope.minShapeshiftAmount && result <= $scope.maxShapeshiftAmount));
+      && (!$scope.shapeshiftOrderId
+          || (result >= $scope.minShapeshiftAmount && result <= $scope.maxShapeshiftAmount));
 
     if (lodash.isNumber(result)) {
       $scope.globalResult = isExpression($scope.amount) ? '= ' + processResult(result) : '';
@@ -409,7 +408,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
         amount = (amount * unitToSatoshi).toFixed(0);
       }
 
-      $state.transitionTo('tabs.send.confirm', {
+      var confirmData = {
         recipientType: $scope.recipientType,
         toAmount: amount,
         toAddress: $scope.toAddress,
@@ -417,8 +416,16 @@ angular.module('copayApp.controllers').controller('amountController', function($
         toEmail: $scope.toEmail,
         toColor: $scope.toColor,
         coin: coin,
-        useSendMax: $scope.useSendMax
-      });
+        useSendMax: $scope.useSendMax,
+      };
+
+      if ($scope.shapeshiftOrderId) {
+        var shapeshiftOrderUrl = 'https://www.shapeshift.io/#/status/';
+        shapeshiftOrderUrl += $scope.shapeshiftOrderId;
+        confirmData.description = shapeshiftOrderUrl;
+      }
+
+      $state.transitionTo('tabs.send.confirm', confirmData);
     }
     $scope.useSendMax = null;
   };
diff --git a/src/js/directives/shapeshiftCoinTrader.js b/src/js/directives/shapeshiftCoinTrader.js
index 40184ab5a..ea577bdf6 100644
--- a/src/js/directives/shapeshiftCoinTrader.js
+++ b/src/js/directives/shapeshiftCoinTrader.js
@@ -92,8 +92,8 @@ angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function
                         return;
                     }
                     $scope.depositInfo = txData;
-                    console.log($scope.marketData);
-                    console.log($scope.depositInfo);
+                    //console.log($scope.marketData);
+                    //console.log($scope.depositInfo);
                     var sendAddress = txData.depositQR;
                     if (sendAddress && sendAddress.indexOf('bitcoin cash') >= 0)
                       sendAddress = sendAddress.replace('bitcoin cash', 'bitcoincash');
diff --git a/www/views/amount.html b/www/views/amount.html
index d2ecd76f4..d81c076b3 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -45,7 +45,7 @@
         </div>
       </div>
 
-      <div ng-if="minShapeshiftAmount && maxShapeshiftAmount">
+      <div ng-if="shapeshiftOrderId">
         Minimum amount: {{minShapeshiftAmount}} <br/>
         Maximum amount: {{maxShapeshiftAmount}}
       </div>