0.0.51 release

- New transaction history UI with search and date ranges - QR code scanning in addressbook - Fixed currency not being updated in transactions list after change in settings - Other minor improvements
greenaddress · Aug 19, 2014 · f225104 · f225104
1 parent 6a3dea4
commit f225104
Show file tree

Hide file tree

Showing 104 changed files with 1,222 additions and 843 deletions.
diff --git a/platforms/android/AndroidManifest.xml b/platforms/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="50" android:versionName="0.0.50" android:windowSoftInputMode="adjustPan" package="it.greenaddress.cordova" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="51" android:versionName="0.0.51" android:windowSoftInputMode="adjustPan" package="it.greenaddress.cordova" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application android:debuggable="false" android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name">

diff --git a/www/config.xml b/www/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="it.greenaddress.cordova" version="0.0.50" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="it.greenaddress.cordova" version="0.0.51" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>GreenAddress.It</name>
     <description>
         GreenAddress.It Mobile Wallet

diff --git a/www/greenaddress.it/de/wallet.html b/www/greenaddress.it/de/wallet.html
@@ -63,7 +63,7 @@
 <script type="text/javascript" src="../static/js/angular/angular-touch.min.js"></script>
 <script type="text/javascript" src="../static/js/angular/qrcode.js"></script>
 <script type="text/javascript" src="../static/js/angular/angular-qr.min.js"></script>
-<script type="text/javascript" src="../static/js/angular/ui-bootstrap-tpls-0.10.0.min.js"></script>
+<script type="text/javascript" src="../static/js/angular/ui-bootstrap-tpls-0.11.0.min.js"></script>
 <script type="text/javascript" src="../static/js/sha512.js"></script>
 <script type="text/javascript" src="../static/js/greenwallet/signuplogin/controllers.js"></script>
 <script type="text/javascript" src="../static/js/greenwallet/info/controllers.js"></script>
@@ -126,7 +126,7 @@
     <i class="menu-mobile-toggle menu-mobile-toggle-close glyphicon glyphicon-remove" toggle-class="visible" ng-click="toggle_set(false)"></i>
     <small>(( subpage_title ))</small>
   </div>
-  <div class="menu-mobile-bottom" toggle-class="visible">
+  <div class="menu-mobile-bottom" toggle-class="visible" ng-show="wallet.final_balance !== undefined">
     <a style="color:inherit;" href="" x-apple-data-detectors="false">((wallet.final_balance|format_btc:wallet.unit))</a> ≈ <a style="color:inherit;"  href="" x-apple-data-detectors="false">((wallet.fiat_value|number:2)) ((wallet.fiat_currency))</a> 
   </div>
   <div class="container" toggle-class="visible">

diff --git a/www/greenaddress.it/de/wallet/partials/wallet_address_book.html b/www/greenaddress.it/de/wallet/partials/wallet_address_book.html
@@ -27,14 +27,23 @@
 				<!-- TODO: move to modal -->
 				<tr ng-show="addressbook.new_item" submittable>
 				<td></td>
-				<td><form ng-submit="submit_me()" class="inline">
-				<input type="text" ng-model="addressbook.new_item.name" focus-on="addrbook_new_item" />
-				</form></td>
-				<td><form ng-submit="save()" class="inline">
-				<input type="text" required="required" ng-model="addressbook.new_item.address" />
+				<td class="col-md-4"><form ng-submit="submit_me()" class="inline"><input type="text" class="form-control" required="required" ng-model="addressbook.new_item.name" focus-on="addrbook_new_item" /></form></td>
+				<td class="col-md-4"><form ng-submit="save()" class="inline">
+				<span class="input-group">
+					<input type="text" class="form-control" ng-model="addressbook.new_item.address" />
+					<span class="input-group-btn">
+						<span class="btn btn-default" ng-hide="scanning_qr_video">
+							<i class="glyphicon glyphicon-qrcode"></i>
+			                QR Scannen
+			                <input style="opacity: 0; position: absolute; left: 0; top: 0; width: 100%; height: 100%" type="file" id="qrcodeinput_login" accept="image/*" capture="camera" ga-click-no-touch="read_qr_code($event)">
+		                </span>
+		                <a class="btn btn-default" ng-show="scanning_qr_video" ng-click="stop_scanning_qr_code()">Abbrechen</a>
+		            </span>
+		        </span>
+
 				<input type="submit" class="hide" submitter />
 				</form></td>
-				<td><a href="" ng-click="submit_me()">Save</a></td>
+				<td><form><a href="" class="btn btn-default" ng-click="submit_me()">Save</a></form></td>
 				</tr>
 				<tr ng-class="{danger: item.name == route.name}" submittable addressbook-item ng-repeat="item in addressbook.partitions[route.page-1][2]"></tr>
 				<tr ng-hide="addressbook.items.length || is_loading">

diff --git a/www/greenaddress.it/de/wallet/partials/wallet_modal_verify_mnemonic.html b/www/greenaddress.it/de/wallet/partials/wallet_modal_verify_mnemonic.html
@@ -1,7 +1,7 @@
 <div submittable>
 
     <div class="modal-body">
-    	<p class="text-center">Please enter the following words from your mnemonic:</p>
+    	<p class="text-center">Please enter the following words from your <strong>unencrypted</strong> mnemonic:</p>
         <form ng-submit="verify_mnemonic_submit()">
             <div ng-class="{'has-error': verified_mnemonic_errors[$index]}" ng-repeat="index in verify_mnemonics_words_indices">
                 <hr />

diff --git a/www/greenaddress.it/de/wallet/partials/wallet_send.html b/www/greenaddress.it/de/wallet/partials/wallet_send.html
@@ -12,9 +12,9 @@
         <label class="col-sm-2 control-label" for="voucher_text" ng-show="send_tx.voucher">Voucher Text (optional)</label>
         <label class="col-sm-2 control-label" for="recipient" ng-hide="send_tx.voucher">Empfänger</label>
         <div class="col-sm-10" ng-show="send_tx.voucher">
-          
+
             <input ng-model="send_tx.voucher_text" class="form-control" type="text" id="voucher_text" placeholder="Enter any clear text message that will appear on the voucher" />
-          
+
         </div>
         <div class="col-sm-10" ng-hide="send_tx.voucher">
           <div class="input-group">
@@ -43,7 +43,7 @@
               </span>
               <a class="btn btn-default" ng-show="scanning_qr_video" ng-click="send_tx.stop_scanning_qr_code()">Abbrechen</a>
             </span>
-          </div>  
+          </div>
 
           <a class="btn btn-info btn-xs btn-adv-options" ng-hide="send_tx.advanced_options_visible || send_tx.recipient_overridden || send_tx.recipient.type == 'payreq'" ng-click="send_tx.advanced_options_visible=true"><i class="glyphicon glyphicon-wrench"></i> show advanced options</a>
         </div>
@@ -107,7 +107,7 @@
         </div>
       </div>
       <hr class="double">
-      <button ng-disabled="send_tx.sending || send_tx.processing_payreq" class="btn btn-primary btn-block-xs pull-right" ng-click="send_tx.send_money()" href=""><i class="glyphicon glyphicon-send"></i> 
+      <button ng-disabled="send_tx.sending || send_tx.processing_payreq" class="btn btn-primary btn-block-xs pull-right" ng-click="send_tx.send_money()" href=""><i class="glyphicon glyphicon-send"></i>
         <span ng-hide="send_tx.voucher || (send_tx.sending && send_tx.signing)">Geld senden</span>
         <span ng-show="!send_tx.voucher && send_tx.sending && send_tx.signing">
           <span ng-show="send_tx.verifying">Verifying ((send_tx.verifying_percentage))% /</span>

diff --git a/www/greenaddress.it/de/wallet/partials/wallet_settings.html b/www/greenaddress.it/de/wallet/partials/wallet_settings.html
@@ -150,7 +150,7 @@
         </div>
         <hr>
         <button class="btn btn-danger btn-block-xs" ng-click="remove_all_pin_logins()"><i class="glyphicon glyphicon-remove"></i> Deaktiviere schnelles Anmelden auf allen Geräten</button>
-        <!-- 
+        <!--
         <div class="form-group">
           <select id="quick-login-select" ng-model="quicklogin.selected_device" ng-options="device.device_name for device in quicklogin.devices"></select>
           <label for="pin" class="col-sm-3 control-label">PIN setzen auf</label>

diff --git a/www/greenaddress.it/de/wallet/partials/wallet_transactions.html b/www/greenaddress.it/de/wallet/partials/wallet_transactions.html
@@ -37,14 +37,31 @@
   <div class="row">
     <div class="col-md-12">
       <div class="sub-header">Ihre letzten Transaktionen</div>
-      <div class="header-options">
-        <ul class="nav nav-pills">
-          <li ng-class="{active: wallet.transactions.limiter.cur_limit[0] == '10'}"><a href="" ng-click="wallet.transactions.limiter.last10()">Letzte 10 Einträge</a></li>
-          <li ng-class="{active: wallet.transactions.limiter.cur_limit.toString() == ['months', 1].toString()}"><a href="" ng-click="wallet.transactions.limiter.lastnmonths(1)">Letzter Monat</a></li>
-          <li ng-class="{active: wallet.transactions.limiter.cur_limit.toString() == ['months', 3].toString()}"><a href="" ng-click="wallet.transactions.limiter.lastnmonths(3)">Letzte drei Monate</a></li>
-          <li ng-class="{active: wallet.transactions.limiter.cur_limit[0] == 'all'}"><a href="" ng-click="wallet.transactions.limiter.all()">Alle</a></li>
-        </ul>
-      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-4">
+      <form>
+        <p class="input-group">
+          <input type="text" class="form-control" datepicker-popup="yyyy/MM/dd" ng-model="search.date_start" placeholder="From date" is-open="search.is_open_from" max-date="search.today" close-text="Schließen" />
+          <span class="input-group-btn">
+            <button type="button" class="btn btn-default" ng-click="search.open_picker($event, 'from')"><i class="glyphicon glyphicon-calendar"></i></button>
+          </span>
+        </p>
+      </form>
+    </div>
+    <div class="col-md-4">
+      <form>
+        <p class="input-group">
+          <input type="text" class="form-control" datepicker-popup="yyyy/MM/dd" ng-model="search.date_end" placeholder="To date" is-open="search.is_open_to" max-date="search.today" close-text="Schließen" />
+          <span class="input-group-btn">
+            <button type="button" class="btn btn-default" ng-click="search.open_picker($event, 'to')"><i class="glyphicon glyphicon-calendar"></i></button>
+          </span>
+        </p>
+      </form>
+    </div>
+    <div class="col-md-4">
+      <form><input class="form-control" placeholder="Search" ng-model="search.query" type="text" /></form>
     </div>
   </div>
   <div class="row">

diff --git a/www/greenaddress.it/de/wallet/partials/wallet_transactions_table.html b/www/greenaddress.it/de/wallet/partials/wallet_transactions_table.html
@@ -1,17 +1,19 @@
-<table class="table table-striped" ng-init="(reversed = true) && (order_by = 'ts')">
+<p class="label label-success" ng-show="wallet.transactions.pending_from_notification">New transactions! Sort by descending date to see them.</p>
+<p class="label label-success" ng-show="wallet.transactions.pending_conf_from_notification">Newly confirmed transactions! Sort by descending date to see them.</p>
+<table class="table table-striped" ng-init="(sorting.reversed = true) && (sorting.order_by = 'ts')">
   <thead>
     <tr>
-      <th><a href="" ng-click="order_by=='ts' ? (reversed = !reversed) : (order_by = 'ts')">
-        <i ng-show="order_by == 'ts'" class="glyphicon"
-        ng-class="{'glyphicon-chevron-down': reversed, 'glyphicon-chevron-up': !reversed}"></i> Datum</a></th>
+      <th><a href="" ng-click="sorting.order_by=='ts' ? (sorting.reversed = !sorting.reversed) : (sorting.order_by = 'ts'); (filtered_transactions||wallet.transactions).sort_by(sorting);">
+        <i ng-show="sorting.order_by == 'ts'" class="glyphicon"
+        ng-class="{'glyphicon-chevron-down': sorting.reversed, 'glyphicon-chevron-up': !sorting.reversed}"></i> Datum</a></th>
       <th>Beschreibung</th>
-      <th class="text-right"><a href="" ng-click="order_by == 'value_sort' ? (reversed = !reversed) : (order_by = 'value_sort')"><i ng-show="order_by == 'value_sort'" class="glyphicon"
-        ng-class="{'glyphicon-chevron-down': reversed, 'glyphicon-chevron-up': !reversed}"></i>(( wallet.unit ))</a></th>
+      <th class="text-right"><a href="" ng-click="sorting.order_by == 'value' ? (sorting.reversed = !sorting.reversed) : (sorting.order_by = 'value'); (filtered_transactions||wallet.transactions).sort_by(sorting);"><i ng-show="sorting.order_by == 'value'" class="glyphicon"
+        ng-class="{'glyphicon-chevron-down': sorting.reversed, 'glyphicon-chevron-up': !sorting.reversed}"></i>(( wallet.unit ))</a></th>
     </tr>
   </thead>
 
   <tbody>
-    <tr ng-repeat="transaction in wallet.transactions.list | limitTo:wallet.transactions.limit | orderBy:order_by:reversed">
+    <tr ng-repeat="transaction in (filtered_transactions||wallet.transactions).list">
       <td class="date">(( transaction.ts|date:"dd/MM/yyyy" ))</td>
       <td>
         <div class="desc">
@@ -41,11 +43,14 @@
       <td class="amount" ng-style="{opacity: (transaction.double_spent_by !== undefined) ? 0.3 : 1}">
         <span class="amount" ng-class="{'amount-plus': transaction.positive, 'amount-minus': transaction.negative}" ng-hide="!transaction.nonzero && transaction.redeemable">(( transaction.value|format_btc_nounit:wallet.unit ))</span>
         <span class="amount amount-redeemable" ng-show="!transaction.nonzero && transaction.redeemable">(( transaction.redeemable_value|format_btc_nounit:wallet.unit ))</span><br>
-        <span class="amount info" ng-class="{'amount-plus': transaction.positive, 'amount-minus': transaction.negative}">(( transaction.value_fiat|number:2 )) (( wallet.transactions.fiat_currency ))</span>
+        <span class="amount info" ng-class="{'amount-plus': transaction.positive, 'amount-minus': transaction.negative}">(( transaction.value_fiat|number:2 )) (( (filtered_transactions||wallet.transactions).fiat_currency ))</span>
       </td>
     </tr>
-    <tr ng-hide="wallet.transactions.list || wallet.transactions === undefined">
+    <tr ng-hide="(filtered_transactions||wallet.transactions).list || (filtered_transactions||wallet.transactions) === undefined">
       <td colspan="3"><small class="text-muted"><i>Keine Transaktionen gefunden...</i></small></td>
     </tr>
+    <tr ng-show="(filtered_transactions||wallet.transactions).next_page_id">
+      <td colspan="3" style="text-align: center;"><a href="" ng-click="(filtered_transactions||wallet.transactions).fetch_next_page()"><small class="text-muted"><i>Show more transactions...</i></small></a></td>
+    </tr>
   </tbody>
 </table>
diff --git a/www/greenaddress.it/el/wallet.html b/www/greenaddress.it/el/wallet.html
@@ -63,7 +63,7 @@
 <script type="text/javascript" src="../static/js/angular/angular-touch.min.js"></script>
 <script type="text/javascript" src="../static/js/angular/qrcode.js"></script>
 <script type="text/javascript" src="../static/js/angular/angular-qr.min.js"></script>
-<script type="text/javascript" src="../static/js/angular/ui-bootstrap-tpls-0.10.0.min.js"></script>
+<script type="text/javascript" src="../static/js/angular/ui-bootstrap-tpls-0.11.0.min.js"></script>
 <script type="text/javascript" src="../static/js/sha512.js"></script>
 <script type="text/javascript" src="../static/js/greenwallet/signuplogin/controllers.js"></script>
 <script type="text/javascript" src="../static/js/greenwallet/info/controllers.js"></script>
@@ -126,7 +126,7 @@
     <i class="menu-mobile-toggle menu-mobile-toggle-close glyphicon glyphicon-remove" toggle-class="visible" ng-click="toggle_set(false)"></i>
     <small>(( subpage_title ))</small>
   </div>
-  <div class="menu-mobile-bottom" toggle-class="visible">
+  <div class="menu-mobile-bottom" toggle-class="visible" ng-show="wallet.final_balance !== undefined">
     <a style="color:inherit;" href="" x-apple-data-detectors="false">((wallet.final_balance|format_btc:wallet.unit))</a> ≈ <a style="color:inherit;"  href="" x-apple-data-detectors="false">((wallet.fiat_value|number:2)) ((wallet.fiat_currency))</a> 
   </div>
   <div class="container" toggle-class="visible">

diff --git a/www/greenaddress.it/el/wallet/partials/wallet_address_book.html b/www/greenaddress.it/el/wallet/partials/wallet_address_book.html
@@ -27,14 +27,23 @@
 				<!-- TODO: move to modal -->
 				<tr ng-show="addressbook.new_item" submittable>
 				<td></td>
-				<td><form ng-submit="submit_me()" class="inline">
-				<input type="text" ng-model="addressbook.new_item.name" focus-on="addrbook_new_item" />
-				</form></td>
-				<td><form ng-submit="save()" class="inline">
-				<input type="text" required="required" ng-model="addressbook.new_item.address" />
+				<td class="col-md-4"><form ng-submit="submit_me()" class="inline"><input type="text" class="form-control" required="required" ng-model="addressbook.new_item.name" focus-on="addrbook_new_item" /></form></td>
+				<td class="col-md-4"><form ng-submit="save()" class="inline">
+				<span class="input-group">
+					<input type="text" class="form-control" ng-model="addressbook.new_item.address" />
+					<span class="input-group-btn">
+						<span class="btn btn-default" ng-hide="scanning_qr_video">
+							<i class="glyphicon glyphicon-qrcode"></i>
+			                Σαρώστε το κωδικό QR
+			                <input style="opacity: 0; position: absolute; left: 0; top: 0; width: 100%; height: 100%" type="file" id="qrcodeinput_login" accept="image/*" capture="camera" ga-click-no-touch="read_qr_code($event)">
+		                </span>
+		                <a class="btn btn-default" ng-show="scanning_qr_video" ng-click="stop_scanning_qr_code()">Ακύρωση</a>
+		            </span>
+		        </span>
+
 				<input type="submit" class="hide" submitter />
 				</form></td>
-				<td><a href="" ng-click="submit_me()">Save</a></td>
+				<td><form><a href="" class="btn btn-default" ng-click="submit_me()">Save</a></form></td>
 				</tr>
 				<tr ng-class="{danger: item.name == route.name}" submittable addressbook-item ng-repeat="item in addressbook.partitions[route.page-1][2]"></tr>
 				<tr ng-hide="addressbook.items.length || is_loading">

diff --git a/www/greenaddress.it/el/wallet/partials/wallet_modal_verify_mnemonic.html b/www/greenaddress.it/el/wallet/partials/wallet_modal_verify_mnemonic.html
@@ -1,7 +1,7 @@
 <div submittable>
 
     <div class="modal-body">
-    	<p class="text-center">Please enter the following words from your mnemonic:</p>
+    	<p class="text-center">Please enter the following words from your <strong>unencrypted</strong> mnemonic:</p>
         <form ng-submit="verify_mnemonic_submit()">
             <div ng-class="{'has-error': verified_mnemonic_errors[$index]}" ng-repeat="index in verify_mnemonics_words_indices">
                 <hr />

diff --git a/www/greenaddress.it/el/wallet/partials/wallet_send.html b/www/greenaddress.it/el/wallet/partials/wallet_send.html
@@ -12,9 +12,9 @@
         <label class="col-sm-2 control-label" for="voucher_text" ng-show="send_tx.voucher">Voucher Text (optional)</label>
         <label class="col-sm-2 control-label" for="recipient" ng-hide="send_tx.voucher">Παραλήπτης</label>
         <div class="col-sm-10" ng-show="send_tx.voucher">
-          
+
             <input ng-model="send_tx.voucher_text" class="form-control" type="text" id="voucher_text" placeholder="Enter any clear text message that will appear on the voucher" />
-          
+
         </div>
         <div class="col-sm-10" ng-hide="send_tx.voucher">
           <div class="input-group">
@@ -43,7 +43,7 @@
               </span>
               <a class="btn btn-default" ng-show="scanning_qr_video" ng-click="send_tx.stop_scanning_qr_code()">Ακύρωση</a>
             </span>
-          </div>  
+          </div>
 
           <a class="btn btn-info btn-xs btn-adv-options" ng-hide="send_tx.advanced_options_visible || send_tx.recipient_overridden || send_tx.recipient.type == 'payreq'" ng-click="send_tx.advanced_options_visible=true"><i class="glyphicon glyphicon-wrench"></i> show advanced options</a>
         </div>
@@ -107,7 +107,7 @@
         </div>
       </div>
       <hr class="double">
-      <button ng-disabled="send_tx.sending || send_tx.processing_payreq" class="btn btn-primary btn-block-xs pull-right" ng-click="send_tx.send_money()" href=""><i class="glyphicon glyphicon-send"></i> 
+      <button ng-disabled="send_tx.sending || send_tx.processing_payreq" class="btn btn-primary btn-block-xs pull-right" ng-click="send_tx.send_money()" href=""><i class="glyphicon glyphicon-send"></i>
         <span ng-hide="send_tx.voucher || (send_tx.sending && send_tx.signing)">Αποστολή χρημάτων</span>
         <span ng-show="!send_tx.voucher && send_tx.sending && send_tx.signing">
           <span ng-show="send_tx.verifying">Verifying ((send_tx.verifying_percentage))% /</span>

diff --git a/www/greenaddress.it/el/wallet/partials/wallet_settings.html b/www/greenaddress.it/el/wallet/partials/wallet_settings.html
@@ -150,7 +150,7 @@
         </div>
         <hr>
         <button class="btn btn-danger btn-block-xs" ng-click="remove_all_pin_logins()"><i class="glyphicon glyphicon-remove"></i> Απενεργοποιήσετε τη γρήγορη σύνδεση σε όλες τις συσκευές</button>
-        <!-- 
+        <!--
         <div class="form-group">
           <select id="quick-login-select" ng-model="quicklogin.selected_device" ng-options="device.device_name for device in quicklogin.devices"></select>
           <label for="pin" class="col-sm-3 control-label">Ορίστε το PIN</label>