Fix glidera issues (tx proposals and ui)

public/views/buyGlidera.html

@@ -24,7 +24,7 @@
       (remaining {{limits.monthlyBuyRemaining|currency:'':2}} {{limits.currency}})
     </div>
 
-    <div class="box-notification m20b" ng-show="limits.transactDisabledPendingFirstTransaction  && !buy.success">
+    <div class="box-notification warning" ng-show="limits.transactDisabledPendingFirstTransaction  && !buy.success">
       <span class="text-warning">
         This operation was disabled because you have a pending first transaction
       </span>
@@ -35,7 +35,7 @@
       <form name="buyPriceForm" ng-if="token"
         ng-submit="buy.get2faCode(token)" novalidate>
 
-        <div class="list">
+        <div class="card list">
           <label class="item item-input item-stacked-label">
             <span class="input-label">Amount in {{showAlternative ? 'USD' : 'BTC'}}</span>
             <input ng-show="!showAlternative"
@@ -83,7 +83,7 @@
           ...
         </div>
 
-        <button class="button button-block"
+        <button class="button button-block button-positive"
                 type="submit"
                 ng-disabled="limits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty || buy.loading">
           Continue
@@ -99,12 +99,12 @@
         </p>
         <form name="buyForm"
           ng-submit="buy.sendRequest(token, permissions, twoFaCode)" novalidate>
-          <div class="list">
+          <div class="card list">
             <label class="item item-input">
               <input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
             </label>
           </div>
-          <button class="button button-block"
+          <button class="button button-block button-positive"
                   type="submit" ng-disabled="buyForm.$invalid || buy.loading">
             Buy
           </button>
@@ -120,7 +120,7 @@
       A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.
       </p>
 
-      <button class="button button-block" ui-sref="glidera.main">OK</button>
+      <button class="button button-block button-positive" ui-sref="glidera.main">OK</button>
     </div>
   </ion-content>
 </ion-view>

public/views/glidera.html

@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button back-button" ui-sref="tabs.home">
+      <button class="button button-clear" ui-sref="tabs.home">
-        <i class="icon ion-ios-arrow-thin-left"></i>
+        Close
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Glidera</ion-nav-title>
@@ -39,7 +39,7 @@
 
           <p class="m20t text-gray size-12">Connect your Glidera account to get started</p>
 
-          <button class="button"
+          <button class="button button-block button-positive"
             ng-click="openExternalLink(glidera.getAuthenticateUrl(), '_system'); showOauthForm = true">
             Connect to Glidera
           </button>
@@ -51,7 +51,7 @@
         </div>
         <div ng-show="showOauthForm">
           <form name="oauthCodeForm" ng-submit="glidera.submitOauthCode(code)" novalidate>
-            <div class="list">
+            <div class="card list">
               <label class="item item-input item-stacked-label">
                 <span class="input-label">OAuth Code</span>
                 <input type="text"
@@ -63,12 +63,12 @@
               <div class="col">
                 <input type="button"
                        value="Cancel"
-                       class="button button-block"
+                       class="button button-block button-light"
                        ng-click="showOauthForm = false">
               </div>
               <div class="col">
                 <input
-                   class="button button-block"
+                   class="button button-block button-positive"
                    type="submit"
                    value="Get started"
                    ng-disabled="oauthCodeForm.$invalid">
@@ -113,21 +113,21 @@
         <a ng-show="status.userCanBuy"
             class="item item-icon-right"
             href ui-sref="glidera.buy">
-          <img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="25">
+          <img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="35">
           Buy Bitcoin
           <i class="icon ion-ios-arrow-right"></i>
         </a>
         <a class="item item-icon-right"
             ng-show="status.userCanSell"
             href ui-sref="glidera.sell">
-          <img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="25">
+          <img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="35">
           Sell Bitcoin
           <i class="icon ion-ios-arrow-right"></i>
         </a>
       </div>
 
-      <div class="card" ng-show="permissions.transaction_history">
+      <div class="list card" ng-show="permissions.transaction_history">
-        <div class="item item-divider">
+        <div class="item item-heading">
           Activity
         </div>
         <div ng-show="txs.length == 0 "

public/views/includes/txp.html

@@ -1,5 +1,8 @@
 
 <div class="wallet-activity" ng-class="{'wallet-activity-not-pending':!tx.pendingForUs}">
+  <div class="wallet-activity-amount">
+    {{tx.amountStr}}
+  </div>
   <span ng-show="!tx.merchant">
     <span ng-show="addressbook[tx.toAddress] && !tx.message">
       {{addressbook[tx.toAddress]}}
@@ -18,11 +21,6 @@
   <span>
   </span>
 
-  <div class="wallet-activity-amount">
-    {{tx.amountStr}}
-  </div>
- 
-
   <p class="wallet-activity-note">
     <i class="icon ion-record wallet-activity-note-child" ng-style="{'color':tx.wallet.color}"></i>
     <span class="wallet-activity-note-child">{{tx.wallet.name}}</span>

public/views/modals/glidera-tx-details.html

@@ -1,6 +1,6 @@
 <ion-modal-view ng-controller="glideraTxDetailsController">
   <ion-header-bar align-title="center" class="bar-royal">
-    <button class="button button-clear button-positive"
+    <button class="button button-clear"
             ng-click="cancel()">
       Close
     </button>

public/views/preferencesGlidera.html

@@ -10,7 +10,8 @@
 
   <ion-content ng-controller="preferencesGlideraController" ng-init="init()">
 
-    <ul ng-if="token" class="list">
+    <ul class="list">
+      <div ng-if="token">
       <div class="item item-divider">
         Permissions
       </div>
@@ -38,10 +39,9 @@
         {{permissions.transaction_history}}
       </span>
       </li>
-    </ul>
+      </div>
 
-    <ul ng-if="permissions.view_email_address"
+      <div ng-if="permissions.view_email_address">
-      class="list">
       <div class="item item-divider">
         Email
       </div>
@@ -57,10 +57,9 @@
         {{email.userEmailIsSetup}}
       </span>
       </li>
-    </ul>
+      </div>
 
-    <ul ng-if="permissions.personal_info"
+      <div ng-if="permissions.personal_info">
-      class="list">
       <div class="item item-divider">
         Personal Information
       </div>
@@ -137,10 +136,9 @@
         {{personalInfo.basicInfoState}}
       </span>
       </li>
-    </ul>
+      </div>
 
-    <ul ng-if="token"
+      <div ng-if="token">
-      class="list">
       <div class="item item-divider">
       Status
       </div>
@@ -200,10 +198,9 @@
         {{status.country}}
       </span>
       </li>
-    </ul>
+      </div>
 
-    <ul ng-if="token"
+      <div ng-if="token">
-      class="list">
       <div class="item item-divider">
         Limits
       </div>
@@ -262,9 +259,8 @@
         {{limits.transactDisabledPendingFirstTransaction}}
       </span>
       </li>
-    </ul>
+      </div>
 
-    <ul class="list">
       <div class="item item-divider">
         Account
       </div>

public/views/sellGlidera.html

@@ -34,7 +34,7 @@
       <form name="sellPriceForm" ng-if="token"
         ng-submit="sell.get2faCode(token)" novalidate>
 
-        <div class="list">
+        <div class="card list">
           <label class="item item-input item-stacked-label">
             <span class="input-label"><span>Amount in</span> {{showAlternative ? 'USD' : 'BTC'}}</span>
             <input ng-show="!showAlternative"
@@ -83,7 +83,7 @@
           ...
         </div>
 
-        <button class="button button-block"
+        <button class="button button-block button-positive"
                 type="submit"
                 ng-disabled="limits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty">
           Continue
@@ -99,12 +99,12 @@
         </p>
         <form name="sellForm"
               ng-submit="sell.createTx(token, permissions, twoFaCode)" novalidate>
-          <div class="list">
+          <div class="card list">
             <label class="item item-input">
               <input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
             </label>
           </div>
-          <button class="button button-block"
+          <button class="button button-block button-positive"
                   type="submit"
                   ng-disabled="sellForm.$invalid ">
             Sell
@@ -121,7 +121,7 @@
       A transfer has been initiated to your bank account and should arrive in 4-6 business days.
       </p>
 
-      <button class="button button-block" ui-sref="glidera.main">OK</button>
+      <button class="button button-block button-positive" ui-sref="glidera.main">OK</button>
     </div>
   </ion-content>
 </ion-view>

public/views/tab-home.html

@@ -73,9 +73,8 @@
       <div class="item item-heading" translate>
         Buy & Sell Bitcoin
       </div>
-      <a ng-show="glideraEnabled" ui-sref="glidera.main" class="item item-icon-right">
+      <a ng-show="glideraEnabled" ui-sref="glidera.main" class="item">
         <img src="img/glidera-logo.png" width="90"/>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
       </a>
       <!-- disable coinbase for this release -->
       <!-- <a ng-show="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">

src/js/controllers/modals/txpDetails.js

@@ -5,6 +5,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
   var tx = $scope.tx;
   var copayers = $scope.copayers;
   var isGlidera = $scope.isGlidera;
+  var GLIDERA_LOCK_TIME = 6 * 60 * 60;
   var now = Math.floor(Date.now() / 1000);
   $scope.loading = null;
 

src/js/controllers/preferencesGlidera.js

@@ -51,7 +51,7 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController'
 
       if (permissions.view_email_address && opts.fullUpdate) {
         glideraService.getEmail(accessToken, function(err, data) {
-          $scope.email = data.email;
+          $scope.email = data;
         });
       }
       if (permissions.personal_info && opts.fullUpdate) {

src/sass/main.scss

@@ -86,7 +86,7 @@ h3.title {
 .box-notification {
   padding: 0.5rem;
   border: 1px solid;
-  margin-bottom: 20px;
+  margin: 10px;
   a {
     color: #fff;
   }

src/sass/views/includes/walletActivity.scss

@@ -1,7 +1,8 @@
 .wallet-activity {
 
   &-not-pending {
-    background-color:#eee;
+    opacity: 0.6;
+    filter: alpha(opacity=60); /* For IE8 and earlier */
   }
 
   &-amount {