add paypro modal

public/views/modals/paypro.html

@@ -1,63 +1,59 @@
-<nav class="tab-bar" ng-style="{'background-color':color}">
+<ion-modal-view ng-controller="payproController as payproC">
-  <section class="left-small">
+  <ion-header-bar align-title="center" class="bar-stable">
-    <a ng-click="cancel()" class="p10">
+    <a class="m5t" ng-click="payproModal.hide()">
-      <span class="text-close" translate>Close</span>
+      <span class="text-close">{{'Close'|translate}}</span>
     </a>
-  </section>
+    <h1 class="title" translate>Payment request</h1>
-  <section class="middle tab-bar-section">
+  </ion-header-bar>
-    <h1 class="title ellipsis" translate>
-      Payment request
-    </h1>
-  </section>
-</nav>
 
-<div class="modal-content fix-modals-touch">
+  <ion-content>
-  <div class="header-modal text-center">
+    <div class="header-modal text-center">
-    <div class="size-42">
+      <div class="size-42">
-      {{unitTotal}}  {{unitName}}
+        {{unitTotal}}  {{unitName}}
+      </div>
+      <div class="size-18 m5t text-gray" ng-show="alternative">
+        {{ alternative }} {{ alternativeIsoCode }}
+      </div>
     </div>
-    <div class="size-18 m5t text-gray" ng-show="alternative">
-      {{ alternative }} {{ alternativeIsoCode }}
-    </div>
-  </div>
 
-  <h4 class="title m0" translate>Details</h4>
+    <h4 class="title m10l" translate>Details</h4>
-  <ul class="no-bullet size-14 m0">
+    <ul class="no-bullet size-14 m10t">
-    <li class="line-b p10 oh">
+      <li class="line-b p10 oh">
-    <span class="text-gray" translate>Pay To</span>
+      <span class="text-gray" translate>Pay To</span>
-    <span class="right enable_text_select">{{paypro.domain}}</span>
+      <span class="right enable_text_select">{{paypro.domain}}</span>
-    </li>
+      </li>
-    <li class="line-b p10 oh" ng-if="paypro.toAddress">
+      <li class="line-b p10 oh" ng-if="paypro.toAddress">
-    <span class="text-gray" translate>Address</span>
+      <span class="text-gray" translate>Address</span>
-    <span class="right enable_text_select">{{paypro.toAddress}}</span>
+      <span class="right enable_text_select">{{paypro.toAddress}}</span>
-    </li>
+      </li>
-    <li class="line-b p10 oh">
+      <li class="line-b p10 oh">
-    <span class="text-gray" translate>Certified by</span>
+      <span class="text-gray" translate>Certified by</span>
-    <span class="right text-right">
+      <span class="right text-right">
-      <span ng-show="paypro.caTrusted">
+        <span ng-show="paypro.caTrusted">
-        <i class="fi-lock color-greeni"></i> 
+          <i class="fi-lock color-greeni"></i>
-        {{paypro.caName}}<br>
+          {{paypro.caName}}<br>
-        <span translate>(Trusted)</span>
+          <span translate>(Trusted)</span>
-      </span>
-      <span ng-show="!paypro.caTrusted">
-        <span ng-show="paypro.selfSigned">
-          <i class="fi-unlock color-yellowi"></i> <span translate>Self-signed Certificate</span>
         </span>
-        <span ng-show="!paypro.selfSigned">
+        <span ng-show="!paypro.caTrusted">
-          <i class="fi-unlock color-yellowi"></i>{{paypro.caName}}<br>
+          <span ng-show="paypro.selfSigned">
-          <span translate>WARNING: UNTRUSTED CERTIFICATE</span>
+            <i class="fi-unlock color-yellowi"></i> <span translate>Self-signed Certificate</span>
+          </span>
+          <span ng-show="!paypro.selfSigned">
+            <i class="fi-unlock color-yellowi"></i>{{paypro.caName}}<br>
+            <span translate>WARNING: UNTRUSTED CERTIFICATE</span>
+          </span>
         </span>
       </span>
-    </span>
+      </li>
-    </li>
+      <li class="line-b p10 oh" ng-if="paypro.memo">
-    <li class="line-b p10 oh" ng-if="paypro.memo">
+      <span class="text-gray" translate>Memo</span>
-    <span class="text-gray" translate>Memo</span>
+      <span class="right">{{paypro.memo}}</span>
-    <span class="right">{{paypro.memo}}</span>
+      </li>
-    </li>
+      <li class="line-b p10 oh" ng-if="paypro.expires">
-    <li class="line-b p10 oh" ng-if="paypro.expires">
+      <span class="text-gray" translate>Expires</span>
-    <span class="text-gray" translate>Expires</span>
+      <span class="right">{{paypro.expires * 1000 | amTimeAgo }}</span>
-    <span class="right">{{paypro.expires * 1000 | amTimeAgo }}</span>
+      </li>
-    </li>
+    </ul>
-  </ul>
+    <div class="extra-margin-bottom"></div>
-  <div class="extra-margin-bottom"></div>
+  </ion-content>
-</div>
+</ion-modal-view>

public/views/walletHome.html

@@ -154,7 +154,7 @@
 
           <!-- Activity -->
 
-          <h4 class="title" ng-click="index.startSearch(); openModal()" ng-show="!index.notAuthorized">
+          <h4 class="title" ng-click="index.startSearch(); openSearchModal()" ng-show="!index.notAuthorized">
             <span translate>Activity</span>
             <i class="dib m5l size-16 pointer fi-magnifying-glass"></i>
           </h4>

src/js/controllers/modals/paypro.js

@@ -0,0 +1,16 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('payproController', function($scope, profileService) {
+  var self = $scope.self;
+
+  $scope.alternative = self.alternativeAmount;
+  $scope.alternativeIsoCode = self.alternativeIsoCode;
+  $scope.isRateAvailable = self.isRateAvailable;
+  $scope.unitTotal = ($scope.paypro.amount * self.satToUnit).toFixed(self.unitDecimals);
+  $scope.unitName = self.unitName;
+
+  $scope.cancel = function() {
+    $scope.payproModal.hide();
+    $scope.payproModal.remove();
+  };
+});

src/js/controllers/walletHome.js

@@ -1071,7 +1071,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     $scope.modal = modal;
   });
 
-  $scope.openModal = function() {
+  $scope.openSearchModal = function() {
     $scope.modal.show();
   };
 
@@ -1136,37 +1136,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   this.openPPModal = function(paypro) {
-    $rootScope.modalOpened = true;
+    $scope.paypro = paypro;
-    var ModalInstanceCtrl = function($scope, $modalInstance) {
+    $scope.self = self;
-      var fc = profileService.focusedClient;
-      var satToUnit = 1 / self.unitToSatoshi;
-      $scope.paypro = paypro;
-      $scope.alternative = self.alternativeAmount;
-      $scope.alternativeIsoCode = self.alternativeIsoCode;
-      $scope.isRateAvailable = self.isRateAvailable;
-      $scope.unitTotal = (paypro.amount * satToUnit).toFixed(self.unitDecimals);
-      $scope.unitName = self.unitName;
-      $scope.color = fc.backgroundColor;
 
-      $scope.cancel = function() {
+    $ionicModal.fromTemplateUrl('views/modals/paypro.html', {
-        $modalInstance.dismiss('cancel');
+      scope: $scope
-      };
+    }).then(function(modal) {
-    };
+      $scope.payproModal = modal;
-    var modalInstance = $modal.open({
+      $scope.payproModal.show();
-      templateUrl: 'views/modals/paypro.html',
-      windowClass: animationService.modalAnimated.slideUp,
-      controller: ModalInstanceCtrl,
-    });
-
-    var disableCloseModal = $rootScope.$on('closeModal', function() {
-      modalInstance.dismiss('cancel');
-    });
-
-    modalInstance.result.finally(function() {
-      $rootScope.modalOpened = false;
-      disableCloseModal();
-      var m = angular.element(document.getElementsByClassName('reveal-modal'));
-      m.addClass(animationService.modalAnimated.slideOutDown);
     });
   };
 
@@ -1346,8 +1323,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
     $ionicModal.fromTemplateUrl('views/modals/tx-details.html', {
       scope: $scope,
-      backdropClickToClose: false,
-      hardwareBackButtonClose: false,
       hideDelay: 500
     }).then(function(modal) {
       $scope.txDetailsModal = modal;

src/sass/main.scss

@@ -600,6 +600,10 @@ ul.manage li {
   margin-right: 10px;
 }
 
+.m10l {
+  margin-left: 10px;
+}
+
 .m5l {
   margin-left: 5px;
 }