Merge remote-tracking branch 'origin/wallet/dev' into wallet/prod

i18n/po/template.pot

@@ -72,6 +72,26 @@ msgstr ""
 msgid "Instant transactions with low fees"
 msgstr ""
 
+#: www/views/walletSelector.html:49
+msgid "Insufficient funds"
+msgstr ""
+
+#: www/views/amount.html:42
+msgid "Change Currency"
+msgstr ""
+
+#: www/views/amount.html:49
+msgid "Available Funds"
+msgstr ""
+
+#: www/views/amount.html:59
+msgid "Use All Available Funds"
+msgstr ""
+
+#: www/views/amount.html:99
+msgid "Next"
+msgstr ""
+
 #: www/views/preferencesBitpayServices.html:23
 msgid "Accounts"
 msgstr ""
@@ -1287,6 +1307,7 @@ msgstr ""
 #: www/views/modals/txp-details.html:74
 #: www/views/topup.html:34
 #: www/views/tx-details.html:52
+#: www/views/review.html:22
 msgid "From"
 msgstr ""
 
@@ -3072,6 +3093,14 @@ msgstr ""
 msgid "This bitcoin payment request has expired."
 msgstr ""
 
+#: www/views/review.html:55
+msgid "Payment expires:"
+msgstr ""
+
+#: www/views/review.html:56
+msgid "Payment request has expired"
+msgstr ""
+
 #: www/views/join.html:133
 #: www/views/tab-create-personal.html:103
 #: www/views/tab-create-shared.html:132
@@ -3805,10 +3834,6 @@ msgstr ""
 msgid "You are shifting"
 msgstr ""
 
-#: www/views/review.html:22
-msgid "From:"
-msgstr ""
-
 #: www/views/review.html:36
 msgid "To:"
 msgstr ""
@@ -3817,6 +3842,13 @@ msgstr ""
 msgid "Add personal note"
 msgstr ""
 
+#: www/views/review.html:87
+msgid "Suggested by merchant:"
+msgstr ""
+
+#: src/js/controllers/review.controller.js:37
+msgid "Enter text here"
+msgstr ""
 
 #: www/views/review.html:57
 msgid "Personal note:"

src/js/controllers/review.controller.js

@@ -34,6 +34,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
   };
   vm.originWallet = null;
   vm.paymentExpired = false;
+  vm.personalNotePlaceholder = gettextCatalog.getString('Enter text here');
   vm.primaryAmount = '';
   vm.primaryCurrency = '';
   vm.usingMerchantFee = false;

www/views/amount.html

@@ -46,7 +46,7 @@
           <div class="extra available-funds"
             ng-class="{warning: vm.fundsAreInsufficient}"
             ng-if="!vm.isRequestingSpecificAmount" translate>
-              <span>Available Funds: </span><span><formatted-amount value="{{vm.availableFunds}}" size-equal="true"></formatted-amount></span>
+              <span translate>Available Funds</span>: <span><formatted-amount value="{{vm.availableFunds}}" size-equal="true"></formatted-amount></span>
             </div>
           </div>  
         </div>

www/views/includes/walletHistory.html

@@ -73,7 +73,7 @@
       </span>
       <div>
         <span class="size-12 wallet-details__tx-amount" ng-class="{'wallet-details__tx-amount--recent': btx.recent, 'wallet-details__tx-amount--received': btx.action == 'received', 'wallet-details__tx-amount--sent': btx.action == 'sent'}">
-          <formatted-amount value="{{btx.alternativeAmountStr}}"></formatted-amount>
+          <formatted-amount value="{{btx.action == 'sent'?'-':''}}{{btx.alternativeAmountStr}}"></formatted-amount>
         </span>
       </div>
     </span>

www/views/review.html

@@ -18,7 +18,7 @@
 
     <div class="content-frame negative-top">
       <div class="card card-gutter-compact">
-        <div class="item item-compact" translate>From:</div>
+        <div class="item item-compact"><span translate>From</span>:</div>
         <div class="item item-gutterless item-complex item-avatar">
           <div class="item-content item-content-avatar">
             <i class="icon big-icon-svg theme-circle theme-circle-services">
@@ -52,7 +52,7 @@ <h2>{{vm.destination.name}}<span class="highlight" style="color: {{vm.destinatio
             <img ng-if="vm.thirdParty.name === 'BitPay'" src="img/icon-bitpay.svg" class="bg">
             <img ng-if="vm.thirdParty.name === 'eGifter'" src="img/icon-egifter.png" class="bg">
             <h2>{{vm.destination.name}}</h2>
-            <p translate ng-if="!vm.paymentExpired">Payment expires: {{vm.remainingTimeStr}}</p>
+            <p translate ng-if="!vm.paymentExpired"><span translate>Payment expires:</span> {{vm.remainingTimeStr}}</p>
             <p class="warning" translate ng-if="vm.paymentExpired">Payment request has expired</p>
           </div>
           <div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address' && !vm.thirdParty">
@@ -67,14 +67,14 @@ <h2>{{vm.destination.name}}</h2>
           ng-class="{ 'expand-content-revealed': vm.memoExpanded }"
           ng-click="vm.memoExpanded = !vm.memoExpanded">
           <img src="img/icon-bookmark.svg" class="action-icon">
-          <span class="action-text">Add personal note</span>
+          <span class="action-text" translate>Add personal note</span>
         </div>
         <div class="card card-gutter-compact expand-content"
           ng-class="{ 'expand-content-revealed': vm.memoExpanded }">
           <div class="item item-compact" translate>Personal Note:</div>
           <div class="item">
             <div class="item-content">
-              <textarea elastic placeholder="{{btx.note.body || btx.message || 'Enter text here'}}" class="elastic" ng-model="vm.memo"></textarea>
+              <textarea elastic placeholder="{{btx.note.body || btx.message || vm.personalNotePlaceholder}}" class="elastic" ng-model="vm.memo"></textarea>
             </div>
           </div>
         </div>
@@ -84,10 +84,10 @@ <h2>{{vm.destination.name}}</h2>
   </ion-content>
 
   <div class="fee-summary">
-    <div ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70'" translate="">Suggested by merchant:</div>
+    <div ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70'" translate>Suggested by merchant:</div>
     <div class="amount">
-      <div class="fee-fiat positive" ng-if="vm.feeLessThanACent">Fee: Less than 1 cent</div>
-      <div class="fee-fiat" ng-class="vm.feeIsHigh ? 'negative' : 'positive'" ng-if="!vm.feeLessThanACent">Fee: {{vm.feeFiat}} {{vm.feeCurrency}}</div>
+      <div class="fee-fiat positive" ng-if="vm.feeLessThanACent"><span translate>Fee:</span> <span translate>Less than 1 cent</span></div>
+      <div class="fee-fiat" ng-class="vm.feeIsHigh ? 'negative' : 'positive'" ng-if="!vm.feeLessThanACent"><span translate>Fee:</span> {{vm.feeFiat}} {{vm.feeCurrency}}</div>
       <div class="fee-crypto" ng-if="vm.feeCrypto">
         <formatted-amount value="{{vm.feeCrypto}}" currency="{{vm.origin.currency}}"></formatted-amount>
       </div>

www/views/tab-send.html

@@ -7,7 +7,7 @@
 
       <div class="content-frame" ng-if="fromWallet">
           <div class="card card-gutter-compact">
-            <div class="item item-compact" translate>From:</div>
+            <div class="item item-compact"><span translate>From</span>:</div>
             <div class="item item-gutterless item-complex item-avatar">
               <div class="item-content item-content-avatar">
                 <i class="icon big-icon-svg theme-circle theme-circle-services">

www/views/tx-details.html

@@ -24,9 +24,9 @@
           <span ng-if="btx.action == 'received'" translate>Receiving</span>
         </div>
         <div class="amount-label">
-          <div class="amount"><formatted-amount value="{{btx.amountValueStr}}" currency="{{btx.amountUnitStr}}"></formatted-amount></div>
+          <div class="amount"><formatted-amount value="{{btx.action == 'sent'?'-':''}}{{btx.amountValueStr}}" currency="{{btx.amountUnitStr}}"></formatted-amount></div>
           <div class="alternative" ng-click="showRate = !showRate">
-            <span ng-if="!showRate"><formatted-amount value="{{btx.alternativeAmountStr}}"></formatted-amount></span>
+            <span ng-if="!showRate"><formatted-amount value="{{btx.action == 'sent'?'-':''}}{{btx.alternativeAmountStr}}"></formatted-amount></span>
             <span ng-if="showRate">
               <span ng-if="!rate">...</span>
               <span ng-if="rate">