custom amount

src/js/controllers/amount.js

@@ -24,7 +24,10 @@ angular.module('copayApp.controllers').controller('amountController', function($
     $scope.showAlternativeAmount = !!$scope.cardId;
     $scope.toColor = data.stateParams.toColor;
 
-    if (!$scope.cardId && !$stateParams.toAddress) {
+    $scope.customAmount = data.stateParams.customAmount;
+
+    $scope.title = $scope.customAmount ? gettextCatalog.getString('Request Specific Amount') : gettextCatalog.getString('Enter Amount');
+    if (!$scope.cardId && !data.stateParams.toAddress && !data.stateParams.customAmount) {
       $log.error('Bad params at amount')
       throw ('bad params');
     }
@@ -240,13 +243,20 @@ angular.module('copayApp.controllers').controller('amountController', function($
 
     } else {
       var amount = $scope.showAlternativeAmount ? fromFiat(_amount) : _amount;
-      $state.transitionTo('tabs.send.confirm', {
-        isWallet: $scope.isWallet,
-        toAmount: (amount * unitToSatoshi).toFixed(0),
-        toAddress: $scope.toAddress,
-        toName: $scope.toName,
-        toEmail: $scope.toEmail
-      });
+      if ($scope.customAmount) {
+        $state.transitionTo('tabs.receive.customAmount', {
+          toAmount: (amount * unitToSatoshi).toFixed(0),
+          toAddress: $scope.toAddress
+        });
+      } else {
+        $state.transitionTo('tabs.send.confirm', {
+          isWallet: $scope.isWallet,
+          toAmount: (amount * unitToSatoshi).toFixed(0),
+          toAddress: $scope.toAddress,
+          toName: $scope.toName,
+          toEmail: $scope.toEmail
+        });
+      }
     }
   };
 });

src/js/controllers/customAmount.js

@@ -0,0 +1,19 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('customAmountController', function($rootScope, $scope, $stateParams, txFormatService, platformInfo) {
+
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+    var satToBtc = 1 / 100000000;
+    $scope.isCordova = platformInfo.isCordova;
+    $scope.address = data.stateParams.toAddress;
+    $scope.amount = parseInt(data.stateParams.toAmount);
+    $scope.amountBtc = ($scope.amount * satToBtc).toFixed(8);
+    $scope.amountStr = txFormatService.formatAmountStr($scope.amount);
+    $scope.altAmountStr = txFormatService.formatAlternativeStr($scope.amount);
+  });
+
+  $scope.shareAddress = function(uri) {
+    window.plugins.socialsharing.share(uri, null, null, null);
+  };
+
+});

src/js/controllers/modals/customAmount.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('customAmountController', function($scope, $timeout, $filter, platformInfo, rateService) {
+angular.module('copayApp.controllers').controller('custommAmountController', function($scope, $timeout, $filter, platformInfo, rateService) {
   var self = $scope.self;
 
   $scope.unitName = self.unitName;

src/js/controllers/tab-receive.js

@@ -1,8 +1,9 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabReceiveController', function($rootScope, $scope, $timeout, $log, $ionicModal, $state, $ionicHistory, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService, bwcError) {
+angular.module('copayApp.controllers').controller('tabReceiveController', function($rootScope, $scope, $timeout, $log, $ionicModal, $state, $ionicHistory, $ionicPopover, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService, bwcError) {
 
   var listeners = [];
+  var MENU_ITEM_HEIGHT = 55;
   $scope.isCordova = platformInfo.isCordova;
   $scope.isNW = platformInfo.isNW;
   $scope.walletAddrs = {};
@@ -139,6 +140,31 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     });
   };
 
+  var goRequestAmount = function() {
+    $scope.menu.hide();
+    $state.go('tabs.receive.amount', {
+      customAmount: true,
+      toAddress: $scope.addr
+    });
+  }
+
+  $scope.showMenu = function(allAddresses, $event) {
+    var requestAmountObj = {
+      text: gettextCatalog.getString('Request Specific amount'),
+      action: goRequestAmount,
+    };
+
+    $scope.items = [requestAmountObj];
+    $scope.height = $scope.items.length * MENU_ITEM_HEIGHT;
+
+    $ionicPopover.fromTemplateUrl('views/includes/menu-popover.html', {
+      scope: $scope
+    }).then(function(popover) {
+      $scope.menu = popover;
+      $scope.menu.show($event);
+    });
+  };
+
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     $scope.wallets = profileService.getWallets();
 

src/js/routes.js

@@ -632,6 +632,31 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
 
+    /*
+     *
+     * Request Specific amount
+     *
+     */
+
+    .state('tabs.receive.amount', {
+        url: '/amount/:customAmount/:toAddress',
+        views: {
+          'tab-receive@tabs': {
+            controller: 'amountController',
+            templateUrl: 'views/amount.html'
+          }
+        }
+      })
+      .state('tabs.receive.customAmount', {
+        url: '/customAmount/:toAmount/:toAddress',
+        views: {
+          'tab-receive@tabs': {
+            controller: 'customAmountController',
+            templateUrl: 'views/customAmount.html'
+          }
+        }
+      })
+
     /*
      *
      * Init backup flow

src/sass/views/amount.scss

@@ -34,7 +34,7 @@
     position: absolute;
     top: 10px;
   }
-  .amount-pane {
+  .amount-pane-send {
     position: absolute;
     top: 95px;
     bottom: 0;
@@ -65,6 +65,37 @@
       }
     }
   }
+  .amount-pane-receive {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 100%;
+    background-color: #fff;
+    padding: 0 16px;
+
+    .amount-bar {
+      padding: 24px 0;
+      font-size: 18px;
+      .title {
+        float: left;
+        padding-top: 10px;
+        color: $dark-gray;
+        font-weight: bold;
+      }
+    }
+    .amount {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      flex-grow: 1;
+      position: absolute;
+      bottom: 254px;
+      top: 66px;
+      .light {
+        color: $light-gray;
+      }
+    }
+  }
   .amount {
     &__editable {
       margin-bottom: 1rem;

src/sass/views/custom-amount.scss

@@ -0,0 +1,16 @@
+#custom-amount {
+  .share {
+    justify-content: center;
+  }
+  .info {
+    .single-line {
+      display: flex;
+      align-items: center;
+      padding-top: 17px;
+      padding-bottom: 17px;
+      .item-note {
+        margin-left: 10px;
+      }
+    }
+  }
+}

src/sass/views/tab-receive.scss

@@ -200,7 +200,7 @@
           }
         }
         #bit-address {
-          position: realtive;
+          position: relative;
         }
       }
     }

src/sass/views/views.scss

@@ -41,3 +41,4 @@
 @import "includes/walletSelector";
 @import "integrations/coinbase";
 @import "integrations/glidera";
+@import "custom-amount";

www/views/amount.html

@@ -1,7 +1,7 @@
 <ion-view id="view-amount" hide-tabs>
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>
-      {{'Enter Amount'|translate}}
+      {{title}}
     </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
@@ -9,7 +9,7 @@
 
   <ion-content scroll="false">
 
-    <div>
+    <div ng-if="!customAmount">
       <div class="item item-no-bottom-border recipient-label" translate>Recipient</div>
 
       <div class="item item-text-wrap item-icon-left bitcoin-address" ng-class="{'item-big-icon-left':cardId}">
@@ -26,7 +26,7 @@
       </div>
     </div>
 
-    <div class="amount-pane">
+    <div ng-class="{'amount-pane-send': !customAmount, 'amount-pane-receive': customAmount}">
 
       <div class="amount-bar">
         <div class="title" translate>Amount</div>

www/views/customAmount.html

@@ -0,0 +1,39 @@
+<ion-view id="custom-amount" hide-tabs>
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Custom Amount' | translate}}
+    </ion-nav-title>
+    <ion-nav-back-button>
+    </ion-nav-back-button>
+    <ion-nav-buttons side="secondary">
+      <button class="button no-border" ui-sref="tabs.receive" translate>
+        Finish
+      </button>
+    </ion-nav-buttons>
+  </ion-nav-bar>
+  <ion-content scroll="false">
+    <div class="item head text-center">
+      <qrcode size="220" data="bitcoin:{{address + '?amount=' + amountBtc}}" color="#334"></qrcode>
+      <div class="row text-center share">
+        <div class="item item-icon-left" ng-click="shareAddress('bitcoin:' + address + '?amount=' + amountBtc)" ng-show="true">
+          <i class="icon ion-ios-upload-outline"></i>
+          <span translate>Share</span>
+        </div>
+      </div>
+    </div>
+    <div class="info">
+      <div class="item single-line">
+        <span class="label" translate>Address</span>
+        <span class="item-note ellipsis">
+          {{address}}
+        </span>
+      </div>
+      <div class="item single-line">
+        <span class="label" translate>Amount</span>
+        <span class="item-note">
+          {{amountStr}} - {{altAmountStr}}
+        </span>
+      </div>
+    </div>
+  </ion-content>
+</ion-view>

www/views/tab-receive.html

@@ -1,6 +1,11 @@
 <ion-view id="tab-receive">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
+    <ion-nav-buttons side="secondary">
+      <button ng-disabled="generatingAddress" class="button back-button" ng-click="showMenu(false, $event)">
+        <i class="icon ion-ios-more"></i>
+      </button>
+    </ion-nav-buttons>
   </ion-nav-bar>
   <ion-content scroll="false">
     <article class="list card padding text-center" ng-if="!wallets[0]">