Merge pull request #1848 from cmgustavo/ux/paypro

Ux/paypro

css/src/main.css

@@ -884,9 +884,9 @@ label small.has-error {
 table { 
   border-collapse: collapse; text-align: left; width: 100%; border: none; 
   box-shadow: -2px 1px 9px 1px #DDDDDD;
-  -moz-box-shadow:    1.5px 1.5px 0px 0px rgba(32,48,64,0.10);
+  -webkit-box-shadow: -2px 1px 5px 1px #DDDDDD;
-  box-shadow:         2px 2px 0px 0px rgba(32,48,64,0.10);
+  -moz-box-shadow: -2px 1px 5px 1px #DDDDDD;
-  -o-box-shadow:         2px 2px 0px 0px rgba(32,48,64,0.10);
+  -o-box-shadow: -2px 1px 5px 1px #DDDDDD;
 }
 
 thead tr{ 
@@ -1583,4 +1583,4 @@ a.text-warning:hover {color: #FD7262;}
   margin-top: 20%;
   width: 100%;
   text-align: center;
-}
+}

js/controllers/send.js

@@ -492,6 +492,16 @@ angular.module('copayApp.controllers').controller('SendController',
       }
     };
 
+    $scope.cancelSend = function(form) {
+      delete $rootScope.merchant;
+      $rootScope.merchantError = false;
+      form.address.$setViewValue('');
+      form.address.$render();
+      form.amount.$setViewValue('');
+      form.comment.$setViewValue('');
+      form.$setPristine();
+    };
+
     $scope.onChanged = function() {
       var value = $scope.address || '';
       var uri;

views/history.html

@@ -69,6 +69,12 @@
 
           </div>
           <div ng-show="btx.showDetails" class="m10t">
+            <div class="send-note" ng-show="!!btx.merchant">
+              <p>
+              <b>{{btx.merchant.pr.pd.memo}}</b>
+              <p>
+              <span ng-show="tx.merchant.domain">[{{btx.merchant.domain}}]</span>
+            </div>
             <table class="last-transactions-content" ng-if="btx.actionList.0">
               <tbody>
               <tr ng-repeat="c in btx.actionList">

views/includes/transaction.html

@@ -21,7 +21,7 @@
     </div>
   </div>
 
-  <div class="line-t" ng-show="!!tx.merchant">
+  <div class="line-t m5t" ng-show="!!tx.merchant">
     <div class="send-note">
       <p>
       <b>{{tx.merchant.pr.pd.memo}}</b>

views/send.html

@@ -173,7 +173,12 @@
             </div>
 
             <div class="row">
-              <div class="large-12 columns text-right">
+              <div class="large-6 medium-6 small-6 columns text-left">
+                <a ng-click="cancelSend(sendForm)" class="button warning m0" ng-show="!!$root.merchant">
+                  Cancel
+                </a>
+              </div>
+              <div class="large-6 medium-6 small-6 columns text-right">
                 <button type="submit" class="button primary m0" ng-disabled="sendForm.$invalid || loading">
                   Send
                 </button>