Merge pull request #584 from cmgustavo/bug/window-size-tx-history

Bug/window size tx history

app-template/package.json

@@ -23,6 +23,9 @@
     "frame": true,
     "width": 400,
     "height": 650,
+    "min_width": 400,
+    "max_width": 800,
+    "min_height": 650,
     "position": "center",
     "fullscreen": false
   },

src/js/controllers/buyGlidera.js

@@ -139,7 +139,6 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
 
       $scope.wallets = profileService.getWallets({
         network: $scope.network,
-        n: 1,
         onlyComplete: true
       });
     });

src/js/directives/directives.js

@@ -113,10 +113,13 @@ angular.module('copayApp.directives')
       }
     }
   })
-  .directive('contact', ['addressbookService', 'lodash',
+  .directive('contact', ['addressbookService', 'lodash', 'gettextCatalog',
-    function(addressbookService, lodash) {
+    function(addressbookService, lodash, gettextCatalog) {
       return {
         restrict: 'E',
+        scope: {
+          label: '='
+        },
         link: function(scope, element, attrs) {
           var addr = attrs.address;
           addressbookService.get(addr, function(err, ab) {
@@ -124,7 +127,11 @@ angular.module('copayApp.directives')
               var name = lodash.isObject(ab) ? ab.name : ab;
               element.append(name);
             } else {
-              element.append(addr);
+              if (scope.label && scope.label == 'Sent') {
+                element.append(gettextCatalog.getString('Sent'));
+              } else {
+                element.append(addr);
+              }
             }
           });
         }

www/views/buyAmazon.html

@@ -33,7 +33,7 @@
             ng-submit="buy.confirm()"
             novalidate>
 
-        <div class="list">
+        <div class="list card">
           <label class="item item-input item-stacked-label">
             <span class="input-label">Amount</span>
             <input type="number"

www/views/buyGlidera.html

@@ -32,7 +32,7 @@
       <form name="buyPriceForm" ng-if="token"
         ng-submit="buy.get2faCode(token)" novalidate>
 
-        <div class="list">
+        <div class="list card">
           <label class="item item-input item-stacked-label">
             <span class="input-label">Amount in {{showAlternative ? 'USD' : 'BTC'}}</span>
             <input ng-show="!showAlternative"
@@ -66,7 +66,7 @@
 
         <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
 
-        <div class="text-center text-gray size-12 m20b" ng-show="!buy.gettingBuyPrice && buy.buyPrice.qty">
+        <div class="text-center text-gray size-12 m20v" ng-show="!buy.gettingBuyPrice && buy.buyPrice.qty">
           Buy
           <span ng-show="qty">{{buy.buyPrice.subtotal|currency:'':2}} {{buy.buyPrice.currency}} in Bitcoin</span>
           <span ng-show="fiat">{{buy.buyPrice.qty}} BTC</span>
@@ -96,7 +96,7 @@
         </p>
         <form name="buyForm"
           ng-submit="buy.sendRequest(token, permissions, twoFaCode)" novalidate>
-          <div class="list">
+          <div class="list card">
             <label class="item item-input">
               <input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
             </label>
@@ -106,12 +106,12 @@
             Buy
           </button>
         </form>
-        <p class="m10t size-12 text-gray">
+        <p class="m10t size-12 text-gray padding">
        Fiat will be immediately withdrawn from your bank account. The bitcoins will be purchased and deposited to your wallet in 2-4 business days.
         </p>
       </div>
     </div>
-    <div class="text-center" ng-show="buy.success">
+    <div class="text-center padding" ng-show="buy.success">
       <h1>Purchase initiated</h1>
       <p class="text-gray">
       A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.

www/views/sellGlidera.html

@@ -31,7 +31,7 @@
       <form name="sellPriceForm" ng-if="token"
         ng-submit="sell.get2faCode(token)" novalidate>
 
-        <div class="list">
+        <div class="list card">
           <label class="item item-input item-stacked-label">
             <span class="input-label"><span>Amount in</span> {{showAlternative ? 'USD' : 'BTC'}}</span>
             <input ng-show="!showAlternative"
@@ -65,7 +65,7 @@
 
         <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
 
-        <div class="text-center text-gray size-12 m20b" ng-show="!sell.gettingSellPrice && sell.sellPrice.qty">
+        <div class="text-center text-gray size-12 m20v" ng-show="!sell.gettingSellPrice && sell.sellPrice.qty">
           Sell
           <span ng-show="qty">{{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} in Bitcoin</span>
           <span ng-show="fiat">{{sell.sellPrice.qty}} BTC</span>
@@ -96,7 +96,7 @@
         </p>
         <form name="sellForm"
               ng-submit="sell.createTx(token, permissions, twoFaCode)" novalidate>
-          <div class="list">
+          <div class="list card">
             <label class="item item-input">
               <input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
             </label>
@@ -107,12 +107,12 @@
             Sell
           </button>
         </form>
-        <p class="m10t size-12 text-gray">
+        <p class="m10t size-12 text-gray padding">
         Bitcoins will be immediately sent from your wallet to Glidera. Fiat will be deposited in your bank account in 4-6 business days.
         </p>
       </div>
     </div>
-    <div class="text-center" ng-show="sell.success">
+    <div class="text-center padding" ng-show="sell.success">
       <h1>Sale initiated</h1>
       <p class="text-gray">
       A transfer has been initiated to your bank account and should arrive in 4-6 business days.

www/views/walletDetails.html

@@ -161,8 +161,7 @@
               <span class="ellipsis">
                 <div ng-if="btx.message">{{btx.message}}</div>
                 <div ng-if="!btx.message && btx.note.body">{{btx.note.body}}</div>
-                <div ng-if="!btx.message && !btx.note.body && wallet.addressbook[btx.addressTo]">{{wallet.addressbook[btx.addressTo]}}</div>
+                <contact ng-if="!btx.message && !btx.note.body" class="ellipsis" address="{{btx.addressTo}}" label="'Sent'"></contact>
-                <div ng-if="!btx.message && !btx.note.body && !wallet.addressbook[btx.addressTo]" translate> Sent</div>
               </span>
             </div>