Improves more clicks

public/index.html

@@ -35,7 +35,7 @@
               }"></section>
           </div>
         </div>
-        <a class="close-menu" ng-click="index.closeMenu()"></a>
+        <a class="close-menu" fast-click callback-fn="index.closeMenu()"></a>
 
       </div>
     </div>

public/views/includes/sidebar.html

@@ -9,7 +9,7 @@
     ng-repeat="item in sidebar.wallets track by $index"
     ng-class="{'selected': item.id == index.walletId}"
     class="nav-item">
-    <a ng-click="sidebar.switchWallet(item.id, index.walletId)" class="oh">
+    <a fast-click callback-fn="sidebar.switchWallet(item.id, index.walletId)" class="oh">
       <div class="avatar-wallet"
         ng-style="{'background-color':item.color}">
         <i class="icon-wallet size-21"></i>

public/views/includes/topbar.html

@@ -3,21 +3,21 @@
   ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
   <section class="left-small">
     <a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome  && !index.noFocusedWallet"
-      ng-click="index.openMenu()"><i class="fi-list size-24"></i>
+      fast-click callback-fn="index.openMenu()"><i class="fi-list size-24"></i>
     </a>
     <a ng-show="goBackToState"
-      ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
+      fast-click callback-fn="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
       <span class="text-back">{{'Back'|translate}}</span>
     </a>
 
     <a ng-show="closeToHome" class="p10 "
-      ng-click="topbar.goHome(); index.setCompactTxHistory(); closeToHome = null">
+      fast-click callback-fn="topbar.goHome(); index.setCompactTxHistory(); closeToHome = null">
       <span class="text-close">{{'Close'|translate}}</span>
     </a>
   </section>
 
   <section class="right-small" ng-show="showPreferences && !index.noFocusedWallet">
-    <a class="p10" ng-click="topbar.goPreferences(); index.setCompactTxHistory()">
+    <a class="p10" fast-click callback-fn="topbar.goPreferences(); index.setCompactTxHistory()">
       <i class="fi-widget size-24"></i>
     </a>
   </section>

public/views/includes/transaction.html

@@ -1,6 +1,6 @@
 <div class="ng-animate-disabled row collapse last-transactions-content line-b"
   ng-class="{'text-gray':!tx.pendingForUs}"
-  ng-click="home.openTxpModal(tx, index.copayers, !!index.glideraStatus)">
+  fast-click callback-fn="home.openTxpModal(tx, index.copayers, !!index.glideraStatus)">
   <div class="large-6 medium-6 small-6 columns size-14">
     <div class="m10r left pr">
       <i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}"></i>

public/views/includes/tx-details.html

@@ -1,6 +1,6 @@
 <div 
    ng-controller="txController as txc"
-   class="txModal fix-modals-touch"
+   class="txModal"
    ng-swipe-disable-mouse
    ng-swipe-right="txc.cancel()">
 
@@ -18,140 +18,142 @@
     </section>
   </nav>
 
-  <div class="header-modal text-center" ng-init="txc.getAlternativeAmount(index.showTx)">
+  <div class="txModal-content">
-    <div ng-show="index.showTx.action != 'invalid'">
+    <div class="header-modal text-center" ng-init="txc.getAlternativeAmount(index.showTx)">
-      <div ng-show="index.showTx.action == 'received'">
+      <div ng-show="index.showTx.action != 'invalid'">
-        <img src="img/icon-receive-history.svg" alt="sync" width="50">
+        <div ng-show="index.showTx.action == 'received'">
-        <p class="m0 text-gray size-14" translate>Received</p>
+          <img src="img/icon-receive-history.svg" alt="sync" width="50">
+          <p class="m0 text-gray size-14" translate>Received</p>
+        </div>
+        <div ng-show="index.showTx.action == 'sent'">
+          <img src="img/icon-sent-history.svg" alt="sync" width="50">
+          <p class="m0 text-gray size-14" translate>Sent</p>
+        </div>
+        <div ng-show="index.showTx.action == 'moved'">
+          <img src="img/icon-moved.svg" alt="sync" width="50">
+          <p class="m0 text-gray size-14" translate>Moved</p>
+        </div>
+        
+        <div class="size-36">
+          <span ng-if="index.showTx.action == 'received'">+</span><span ng-if="index.showTx.action == 'sent'">-</span>{{index.showTx.amountStr}}
+        </div>
+        <div class="alternative-amount" ng-click="showRate=!showRate" ng-init="showRate = false">
+          <span class="label gray radius" ng-show="!showRate && alternativeAmountStr">
+            {{alternativeAmountStr}}
+          </span>
+          <span class="size-12" ng-show="showRate && alternativeAmountStr">
+            {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
+          </span>
+        </div>
       </div>
-      <div ng-show="index.showTx.action == 'sent'">
+      <div ng-show="index.showTx.action == 'invalid'">
-        <img src="img/icon-sent-history.svg" alt="sync" width="50">
+        -
-        <p class="m0 text-gray size-14" translate>Sent</p>
+      </div> 
-      </div>
+    </div>
-      <div ng-show="index.showTx.action == 'moved'">
+
-        <img src="img/icon-moved.svg" alt="sync" width="50">
+    <h4 class="title m0" translate>Details</h4>
-        <p class="m0 text-gray size-14" translate>Moved</p>
+
+    <ul class="no-bullet size-14 m0"> 
+
+      <li ng-if="!index.showTx.hasMultiplesOutputs && index.showTx.addressTo && index.showTx.addressTo != 'N/A'" class="line-b p10 oh"
+        ng-click="copyAddress(index.showTx.addressTo)">
+      <span class="text-gray" translate>To</span>
+      <span class="right">
+        <span ng-if="index.showTx.merchant">
+          <span ng-show="index.showTx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{index.showTx.merchant.domain}}</span>
+          <span ng-show="!index.showTx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{index.showTx.merchant.domain}}</span>
+        </span>
+        <span ng-if="!index.showTx.merchant">
+          <span ng-show="index.showTx.labelTo">{{index.showTx.labelTo}}</span>
+          <contact ng-show="!index.showTx.labelTo" class="enable_text_select" address="{{index.showTx.addressTo}}"></contact>
+        </span>
+      </span>
+      </li> 
+
+      <li ng-show="index.showTx.hasMultiplesOutputs" class="line-b p10 oh" 
+        ng-click="showMultiplesOutputs = !showMultiplesOutputs">
+        <span class="text-gray" translate>Recipients</span>
+        <span class="right">{{index.showTx.recipientCount}}
+          <i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i>
+          <i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i>
+        </span>
+      </li>
+
+      <div class="line-b" ng-show="index.showTx.hasMultiplesOutputs && showMultiplesOutputs"
+        ng-repeat="output in index.showTx.outputs"
+        ng-include="'views/includes/output.html'">
       </div>
+
+      <li ng-show="btc.message" class="line-b p10 oh">
+        <span class="text-gray" translate>Note</span>
+        <span class="right">{{index.showTx.message}}</span>
+      </li>
       
-      <div class="size-36">
+      <li ng-if="index.showTx.action == 'invalid'" class="line-b p10 oh">
-        <span ng-if="index.showTx.action == 'received'">+</span><span ng-if="index.showTx.action == 'sent'">-</span>{{index.showTx.amountStr}}
+      <span class="right" translate>
-      </div>
+        This transaction has become invalid; possibly due to a double spend attempt.
-      <div class="alternative-amount" ng-click="showRate=!showRate" ng-init="showRate = false">
+      </span>
-        <span class="label gray radius" ng-show="!showRate && alternativeAmountStr">
+      <li ng-if="index.showTx.time" class="line-b p10 oh">
-          {{alternativeAmountStr}}
+      <span class="text-gray" translate>Date</span>
+      <span class="right">
+        <time>{{ index.showTx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
+        <time>({{ index.showTx.time * 1000 | amTimeAgo}})</time>
+      </span>
+      </li>
+      <li class="line-b p10" ng-show="index.showTx.action != 'received'">
+        <span class="text-gray" translate>Fee</span>
+        <span class="right">{{index.showTx.feeStr}}</span>
+      </li>
+      <li class="line-b p10 oh" ng-if="index.showTx.message && index.showTx.action != 'received'">
+        <span class="text-gray" translate>Note</span>
+        <span class="right">{{index.showTx.message}}</span>
+      </li>
+      <li ng-if="index.showTx.merchant" class="line-b p10 oh">
+      <span class="text-gray" translate>Merchant message</span>
+      <span class="right">
+        {{index.showTx.merchant.pr.pd.memo}}
+      </span>
+      </li>
+      <li ng-if="index.showTx.time" class="line-b p10 oh">
+      <span class="text-gray" translate>Confirmations</span>
+      <span class="right" >
+        <span class="text-warning" ng-show="!index.showTx.confirmations || index.showTx.confirmations == 0" translate>
+          Unconfirmed
         </span>
-        <span class="size-12" ng-show="showRate && alternativeAmountStr">
+        <span class="label gray radius" ng-show="index.showTx.confirmations>0 && !index.showTx.safeConfirmed">
-          {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
+          {{index.showTx.confirmations}}
         </span>
-      </div>
+        <span class="label gray radius" ng-show="index.showTx.safeConfirmed">
-    </div>
+          {{index.showTx.safeConfirmed}}
-    <div ng-show="index.showTx.action == 'invalid'">
-      -
-    </div> 
-  </div>
-
-  <h4 class="title m0" translate>Details</h4>
-
-  <ul class="no-bullet size-14 m0"> 
-
-    <li ng-if="!index.showTx.hasMultiplesOutputs && index.showTx.addressTo && index.showTx.addressTo != 'N/A'" class="line-b p10 oh"
-      ng-click="copyAddress(index.showTx.addressTo)">
-    <span class="text-gray" translate>To</span>
-    <span class="right">
-      <span ng-if="index.showTx.merchant">
-        <span ng-show="index.showTx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{index.showTx.merchant.domain}}</span>
-        <span ng-show="!index.showTx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{index.showTx.merchant.domain}}</span>
-      </span>
-      <span ng-if="!index.showTx.merchant">
-        <span ng-show="index.showTx.labelTo">{{index.showTx.labelTo}}</span>
-        <contact ng-show="!index.showTx.labelTo" class="enable_text_select" address="{{index.showTx.addressTo}}"></contact>
-      </span>
-    </span>
-    </li> 
-
-    <li ng-show="index.showTx.hasMultiplesOutputs" class="line-b p10 oh" 
-      ng-click="showMultiplesOutputs = !showMultiplesOutputs">
-      <span class="text-gray" translate>Recipients</span>
-      <span class="right">{{index.showTx.recipientCount}}
-        <i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i>
-        <i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i>
-      </span>
-    </li>
-
-    <div class="line-b" ng-show="index.showTx.hasMultiplesOutputs && showMultiplesOutputs"
-      ng-repeat="output in index.showTx.outputs"
-      ng-include="'views/includes/output.html'">
-    </div>
-
-    <li ng-show="btc.message" class="line-b p10 oh">
-      <span class="text-gray" translate>Note</span>
-      <span class="right">{{index.showTx.message}}</span>
-    </li>
-    
-    <li ng-if="index.showTx.action == 'invalid'" class="line-b p10 oh">
-    <span class="right" translate>
-      This transaction has become invalid; possibly due to a double spend attempt.
-    </span>
-    <li ng-if="index.showTx.time" class="line-b p10 oh">
-    <span class="text-gray" translate>Date</span>
-    <span class="right">
-      <time>{{ index.showTx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
-      <time>({{ index.showTx.time * 1000 | amTimeAgo}})</time>
-    </span>
-    </li>
-    <li class="line-b p10" ng-show="index.showTx.action != 'received'">
-      <span class="text-gray" translate>Fee</span>
-      <span class="right">{{index.showTx.feeStr}}</span>
-    </li>
-    <li class="line-b p10 oh" ng-if="index.showTx.message && index.showTx.action != 'received'">
-      <span class="text-gray" translate>Note</span>
-      <span class="right">{{index.showTx.message}}</span>
-    </li>
-    <li ng-if="index.showTx.merchant" class="line-b p10 oh">
-    <span class="text-gray" translate>Merchant message</span>
-    <span class="right">
-      {{index.showTx.merchant.pr.pd.memo}}
-    </span>
-    </li>
-    <li ng-if="index.showTx.time" class="line-b p10 oh">
-    <span class="text-gray" translate>Confirmations</span>
-    <span class="right" >
-      <span class="text-warning" ng-show="!index.showTx.confirmations || index.showTx.confirmations == 0" translate>
-        Unconfirmed
-      </span>
-      <span class="label gray radius" ng-show="index.showTx.confirmations>0 && !index.showTx.safeConfirmed">
-        {{index.showTx.confirmations}}
-      </span>
-      <span class="label gray radius" ng-show="index.showTx.safeConfirmed">
-        {{index.showTx.safeConfirmed}}
-      </span>
- 
-    </span>
-    </li>
-  </ul>
-
-  <div ng-if="index.showTx.actions[0] && txc.isShared">
-    <h4 class="title m0" translate>Participants</h4>
-    <ul class="no-bullet size-14 m0">
-      <li class="line-b p10 text-gray" ng-repeat="c in index.showTx.actions">
-        <i class="icon-contact size-24"></i>
-        <span class="right">
-          <i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i>
-          <i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i>
         </span>
-        {{c.copayerName}} <span ng-if="c.copayerId == txc.copayerId">({{'Me'|translate}})</span>
+   
+      </span>
       </li>
     </ul>
-  </div>
 
-  <div ng-show="index.showTx.txid" class="tx-details-blockchain">
+    <div ng-if="index.showTx.actions[0] && txc.isShared">
-    <div class="text-center m20t">
+      <h4 class="title m0" translate>Participants</h4>
-      <button class="button outline round dark-gray tiny" ng-click="$root.openExternalLink('https://' +
+      <ul class="no-bullet size-14 m0">
-        (txc.getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + index.showTx.txid)">
+        <li class="line-b p10 text-gray" ng-repeat="c in index.showTx.actions">
-        <span class="text-gray" translate>See it on the blockchain</span>
+          <i class="icon-contact size-24"></i>
-      </button>
+          <span class="right">
+            <i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i>
+            <i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i>
+          </span>
+          {{c.copayerName}} <span ng-if="c.copayerId == txc.copayerId">({{'Me'|translate}})</span>
+        </li>
+      </ul>
     </div>
-  </div>
 
-  <div class="extra-margin-bottom"></div>
+    <div ng-show="index.showTx.txid" class="tx-details-blockchain">
+      <div class="text-center m20t">
+        <button class="button outline round dark-gray tiny" ng-click="$root.openExternalLink('https://' +
+          (txc.getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + index.showTx.txid)">
+          <span class="text-gray" translate>See it on the blockchain</span>
+        </button>
+      </div>
+    </div>
+
+    <div class="extra-margin-bottom"></div>
+  </div>
 </div>

public/views/modals/destination-address.html

@@ -1,7 +1,7 @@
 <div ng-init="wallets[0] ? selectedWalletsOpt = true : selectedWalletsOpts = false; checkClipboard()">
   <nav class="tab-bar" ng-style="{'background-color':color}">
     <section class="left-small">
-      <a ng-show="!editAddressbook && !addAddressbookEntry" ng-click="cancel()" class="p10">
+      <a ng-show="!editAddressbook && !addAddressbookEntry" fast-click callback-fn="cancel()" class="p10">
         <span class="text-close" translate>Close</span>
       </a>
     </section>
@@ -30,16 +30,14 @@
           ng-style="{'border-color':selectedWalletsOpt ? color : 'inherit'}"
           ng-click="selectedWalletsOpt = true">
         <a href
-          ng-style="{'color':selectedWalletsOpt ? color : 'inherit'}"
+          ng-style="{'color':selectedWalletsOpt ? color : 'inherit'}" translate> My wallets</a>
-          ng-click="create.setTotalCopayers(1)" translate> My wallets</a>
         </div>
         <div class="tab-container small-6 medium-3 large-2" 
           ng-class="{'selected':!selectedWalletsOpt}" 
           ng-style="{'border-color':!selectedWalletsOpt ? color : 'inherit'}"
           ng-click="selectedWalletsOpt = false">
         <a href
-          ng-style="{'color':!selectedWalletsOpt ? color : 'inherit'}"
+          ng-style="{'color':!selectedWalletsOpt ? color : 'inherit'}" translate>My contacts</a>
-          ng-click="create.setTotalCopayers(3)" translate>My contacts</a>
         </div>
       </div>
     </div>

public/views/walletHome.html

@@ -404,7 +404,7 @@
                 </div>
                 <a class="postfix size-12 m0 text-gray"
                 ng-style="{'color':index.backgroundColor}"
-                ng-click="home.openDestinationAddressModal(index.otherWallets, _address)">
+                fast-click callback-fn="home.openDestinationAddressModal(index.otherWallets, _address)">
                   <i class="icon-wallet text-bold size-18"></i>
                 </a>
               </div>

src/css/main.css

@@ -1379,6 +1379,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   }
 }
 
+<<<<<<< a4ed15ab6f9cb6ec415196f24ddee81005a8f3d6
 /* Confirmation popup */
 
 .confirmTxModal {
@@ -1399,6 +1400,12 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   border-top-right-radius: 5px;
 }
 
+.txModal-content {
+  overflow: auto;
+  height: 100%;
+  padding-bottom: 50px;
+}
+
 .txModal {
   background: #f6f7f9;
   border-radius: 5px;