Merge pull request #10 from cmgustavo/bechi/tx-proposal-ui-01

Bechi/tx proposal ui 01

css/src/desktop.css

@@ -172,3 +172,12 @@ a.text-warning:hover {color: #FD7262;}
   background: #ddd;
 }
 
+.reveal-modal .close-reveal-modal:hover, dialog .close-reveal-modal:hover {
+  background-color: #7A8C9E;
+  color: #fff;
+}
+
+.last-transactions-content.active:hover {
+  background-color: #E4E8EC;
+}
+

css/src/main.css

@@ -435,10 +435,6 @@ ul.tx-copayers {
   background-color: #F5F7F8;
 }
 
-.last-transactions-content.active:hover {
-  background-color: #E4E8EC;
-}
-
 .sign-action {
   background: #E4E8EC;
   width: 100%;
@@ -803,7 +799,7 @@ input[type=number]::-webkit-outer-spin-button {
   background-color: #A02F23;
 }
 
-.txp-popup .header {
+.header-modal {
   background: #F3F5F6;
   width: 100%;
   padding: 0.8rem;
@@ -1625,7 +1621,3 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   border-radius: 3px;
 }
 
-.reveal-modal .close-reveal-modal:hover, dialog .close-reveal-modal:hover {
-  background-color: #7A8C9E;
-  color: #fff;
-}

css/src/mobile.css

@@ -294,14 +294,5 @@
     padding: 15px;
   }
 
-  .button-popup {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    background-color: #F3F5F6;
-    padding: 1rem 0;
-  }
-
 }
 

js/controllers/walletForPayment.js

@@ -29,7 +29,7 @@ angular.module('copayApp.controllers').controller('walletForPaymentController',
 
   var modalInstance = $modal.open({
     templateUrl: 'views/modals/walletSelection.html',
-    windowClass: 'tiny',
+    windowClass: 'small',
     controller: ModalInstanceCtrl,
   });
 

views/includes/transaction.html

@@ -12,7 +12,6 @@
         </span>
         <contact address="{{out.address}}" ng-hide="tx.merchant"> </contact>
       </span>
-      </span>
     </div>
 
     <div class="p25l m10b" ng-class="{'text-gray':!pendingForUs}">

views/modals/txp-details.html

@@ -1,5 +1,5 @@
-<div class="txp-popup">
+<div class="header-modal">
-  <div class="header">
+  <div ng-repeat="out in tx.outs">
     <div class="ellipsis p10b size-16 m20r">
       <span class="tx-proposal size-12 m5r"> <i ng-class="{'active':pendingForUs}" class="fi-arrow-right"></i> </span>
       <span class="text-gray">
@@ -10,10 +10,9 @@
         </span>
         <contact address="{{out.address}}" ng-hide="tx.merchant"></contact>
       </span>
-      </span>
     </div>
 
-    <div class="p25l" ng-class="{'text-gray':!pendingForUs}" ng-repeat="out in tx.outs">
+    <div class="p25l" ng-class="{'text-gray':!pendingForUs}">
       <div class="size-21 text-bold m5b">
         {{out.value}} {{$root.wallet.settings.unitName}}
       </div>
@@ -21,12 +20,13 @@
         {{out.alternativeAmount}} {{out.alternativeIsoCode}}
       </span>
     </div>
-    <a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
   </div>
+  <a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
+</div>
 
-  <div class="m10v line-b size-14" ng-show="tx.comment">
+<div class="m10v line-b size-14" ng-show="tx.comment">
   <div class="oh" ng-if="tx.ts || tx.createdTs ">
-      <p class="left m5b">Bechilandia@gmail.com</p>
+    <p class="left m5b">{{$root.iden.getName()}}</p>
     <div class="text-gray text-right m5t size-12">
       <time>{{ (tx.ts || tx.createdTs ) | amTimeAgo}}</time>
     </div>
@@ -34,9 +34,9 @@
   <div class="text-gray m10b">
     {{tx.comment}}
   </div>
-  </div>
+</div>
 
-  <div class="m10v line-b size-14" ng-if="tx.merchant">
+<div class="m10v line-b size-14" ng-if="tx.merchant">
   <div class="oh">
     <p class="left m5b">Merchant Message:</p>
     <div class="text-gray text-right m5t size-12" ng-if="tx.merchant && tx.merchant.expirationDate">
@@ -46,9 +46,9 @@
   <div class="text-gray m10b">
     {{tx.merchant.pr.pd.memo}}
   </div>
-  </div>
+</div>
 
-  <div ng-if="tx.actionList[0]" class="m10v">
+<div ng-if="tx.actionList[0]" class="m10v">
   <i>Signatures:</i>
   <ul class="tx-copayers m10t" ng-if="tx.actionList[0]">
     <li ng-repeat="c in tx.actionList" ng-class="{'bottom-line-copayers':!$last}">
@@ -63,10 +63,9 @@
     <span>{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}</span>
     </li>
   </ul>
-  </div>
+</div>
-  </div>
 
-  <div class="box-notification" ng-show="error">
+<div class="box-notification" ng-show="error">
   <div class="box-icon error">
     <i class="fi-x size-24"></i>
   </div>
@@ -74,9 +73,9 @@
     {{error}}
   </span>
   <a class="close-notification text-warning" ng-click="error=null">&#215;</a>
-  </div>
+</div>
 
-  <div class="row button-popup" 
+<div class="row" 
   ng-init="hideSign = false; hideReject = false"
   ng-show="!tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]">
   <div class="large-6 medium-6 small-6 columns">
@@ -95,6 +94,5 @@
       <span translate>Sign</span>
     </button>
   </div>
-  </div>
 </div>