Fix confirm dialogs and popupService. Fix delete amount in amazon view. Fix ionic topbar

public/views/buyAmazon.html

@@ -44,6 +44,7 @@
                    max="500"
                    ng-model="fiat"
                    ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/"
+                   step="0.01"
                    autocomplete="off" ignore-mouse-wheel required>
             <a class="postfix">USD</a>
           </label>

src/js/controllers/buyAmazon.js

@@ -28,9 +28,9 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
     };
 
     this.confirm = function() {
-      var title = gettextCatalog.getString('Confirm Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat});
+      var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat});
       var ok = gettextCatalog.getString('Buy');
-      popupService.showConfirm(title, null, ok, null, function(res) {
+      popupService.showConfirm(null, message, ok, null, function(res) {
         if (res) self.createTx();
       });
     };

src/js/services/popupService.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.services').service('popupService', function($log, $ionicPopup, platformInfo) {
+angular.module('copayApp.services').service('popupService', function($log, $ionicPopup, platformInfo, gettextCatalog) {
 
   var isCordova = platformInfo.isCordova;
 
@@ -10,7 +10,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
     if (!cb) cb = function() {};
     $ionicPopup.alert({
       title: title,
-      template: message,
+      subTitle: message,
       okType: 'button-clear button-positive'
     }).then(cb);
   };
@@ -18,7 +18,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
   var _ionicConfirm = function(title, message, okText, cancelText, cb) {
     $ionicPopup.confirm({
       title: title,
-      template: message,
+      subTitle: message,
       cancelText: cancelText,
       cancelType: 'button-clear button-positive',
       okText: okText,
@@ -53,6 +53,8 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
       if (buttonIndex == 1) return cb(true);
       else return cb(false);
     }
+    okText = okText || gettextCatalog.getString('OK');
+    cancelText = cancelText || gettextCatalog.getString('Cancel');
     navigator.notification.confirm(message, onConfirm, title, [okText, cancelText]);
   };
 
@@ -67,8 +69,8 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
   /**
    * Show a simple alert popup
    *
-   * @param {String} Title
-   * @param {String} Message (optional)
+   * @param {String} Title (optional)
+   * @param {String} Message
    * @param {Callback} Function (optional)
    */
 
@@ -85,10 +87,10 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
   /**
    * Show a simple confirm popup
    *
-   * @param {String} Title
+   * @param {String} Title (optional)
    * @param {String} Message
-   * @param {String} okText
-   * @param {String} cancelText
+   * @param {String} okText (optional)
+   * @param {String} cancelText (optional)
    * @param {Callback} Function
    * @returns {Callback} OK: true, Cancel: false
    */
@@ -105,7 +107,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
   /**
    * Show a simple prompt popup
    *
-   * @param {String} Title
+   * @param {String} Title (optional)
    * @param {String} Message
    * @param {Object} Object{ inputType, inputPlaceholder, defaultText } (optional)
    * @param {Callback} Function

src/sass/ionic.scss

@@ -5,6 +5,9 @@ $royal: #1e3186;
 $soft-blue: rgb(100,124,232);
 $base-background-color: #f5f5f5;
 
+/* Ionic Workaround */
+
+ion-nav-bar.hide { display: block !important; }
 
 
 @import "../../bower_components/ionic/scss/ionic";