Merge pull request #675 from CounterpartyXCP/develop

Version 1.6.1
CounterpartyXCP · Jan 23, 2015 · 375267f · 375267f
2 parents 927e03d + 48a47c1
commit 375267f
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v1.6.1 ###
+**Fixes:**
+* Bug fixes: http://goo.gl/uj5mcQ
+
 ### v1.6.0 ###
 **Enhancements:**
 - Full multisig support

diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
 Counterwallet
 ================
 
-Online Webwallet for [Counterparty](http://www.counterparty.co).
+Online Webwallet for [Counterparty](http://www.counterparty.io).
 
 Originally based off of [Carbonwallet](http://www.carbonwallet.com) (however virtually all the original code has been removed or rewritten).
 
 
 Production Systems
 -------------------
 
-* Mainnet: **[counterwallet.co](https://www.counterwallet.co/)**
-* Testnet: **[testnet.counterwallet.co](https://testnet.counterwallet.co/)**
+* Mainnet: **[counterwallet.io](https://www.counterwallet.io/)**
+* Testnet: **[testnet.counterwallet.io](https://testnet.counterwallet.io/)**
 
 
 Features
@@ -21,14 +21,14 @@ Features
 - Fully-AJAX driven
 - Anonymous
 - Runs in the browser, with keys created in memory
-
+- Multi-sig
 
 Browser Support
 -------------------
 
 **Desktop**
 
-- Chrome 23+ (Preferred)
+- Chrome 23+ (preferred browser)
 - Firefox 25+
 - Safari 7+
 - Opera 15+
@@ -72,7 +72,7 @@ grunt freeze
 1. Create an account on [Transifex](https://www.transifex.com/)
 2. In your home directory, create a file named `.transifex` and put your Transifex username and password into it in this format: `user:password`
 3. Run `grunt build` to download translations
-4. Add the languages you want to support to `AVAILABLE_LANGUAGES` in **counterwallet.conf.json** - you can use **counterwallet.conf.json.example** as a template
+4. Add the languages you want to support to `AVAILABLE_LANGUAGES` in **counterwallet.conf.json** - you can use **counterwallet.conf.json.example** as a template. The template file contains **only** the setting relevant to languages and does not replace the rest of variables required in that file (refer to Federeated Node documentation for additional details about `coutnerwallet.conf`).
 
 Setting up your own Counterwallet Server
 -----------------------------------------

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "counterwallet",
   "description": "Counterwallet",
   "author": "Counterparty development team",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "main": "build/index.html",
   "repository": { 
     "type" : "git",

diff --git a/src/index.html b/src/index.html
@@ -2,8 +2,8 @@
 <html lang="en-us" style="background-color:#FFF">
   <head>
     <meta charset="utf-8">
-    <title>Counterwallet</title>
-    <meta content="Counterparty Wallet" name="description">
+    <title>Counterwallet - Free Web Wallet for Bitcoin and Counterparty</title>
+    <meta content="Open-source and client-side web wallet for Counterparty (XCP) and Bitcoin (BTC)" name="description">
     <meta content="Counterparty Developers" name="author">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">

diff --git a/src/js/components/balances.js b/src/js/components/balances.js
@@ -28,7 +28,7 @@ function ChangeAddressLabelModalViewModel() {
       var addresses = self.address().split("_");
       var sigRequired = addresses.shift();
       addresses.pop();
-      return addresses.join(", ") + ' (' + sigRequired + '/' + addresses.length + ')';
+      return sigRequired + '_' + addresses.join("_") + '_' + addresses.length;
     }
   });
 
@@ -343,6 +343,8 @@ function CreateNewAddressModalViewModel() {
   };
 
   self.doAction = function() {
+    $('#createNewAddressButtons button').addClass('disabled');
+
     var newAddress;
     var pubKeys;
     if (self.addressType() == 'multisig') {
@@ -379,17 +381,21 @@ function CreateNewAddressModalViewModel() {
     WALLET.getAddressObj(newAddress).label(sanitizedDescription);
 
     //save prefs to server
-    WALLET.storePreferences(function(data, endpoint) {
-      self.shown(false);      
-      WALLET.refreshCounterpartyBalances([newAddress]);
-      WALLET.refreshBTCBalances();
+    WALLET.storePreferences(function(data, endpoint) {  
+      WALLET.refreshCounterpartyBalances([newAddress], function() {
+        WALLET.refreshBTCBalances(false, null, function() {
+          self.shown(false); 
+          setTimeout(checkURL, 300);
+        });
+      });
     });
 
     trackEvent('Balances', self.eventName[self.addressType()]);
 
   }
 
   self.show = function(addressType, resetForm) {
+    $('#createNewAddressButtons button').removeClass('disabled');
     if(typeof(resetForm)==='undefined') resetForm = true;
     if(resetForm) self.resetForm();
     self.addressType(addressType);

diff --git a/src/js/components/logon.js b/src/js/components/logon.js
@@ -167,8 +167,12 @@ function LogonViewModel() {
 
       QUICK_BUY_ENABLE = data['quick_buy_enable'];
 
-      //See if any servers show the wallet as online (this will return the a true result, if any server shows the wallet as online)
-      multiAPI("is_wallet_online", {'wallet_id': WALLET.identifier()}, self.onIsWalletOnline);
+      //Grab preferences
+      multiAPINewest("get_preferences", {
+        'wallet_id': WALLET.identifier(),
+        'network': USE_TESTNET ? 'testnet' : 'mainnet',
+        'for_login': true
+      }, 'last_updated', self.onReceivedPreferences);
 
     },
     function(jqXHR, textStatus, errorThrown, endpoint) {
@@ -177,46 +181,6 @@ function LogonViewModel() {
     });
   }
 
-  self.onIsWalletOnline = function(isOnline, endpoint) {
-    if(isOnline) {
-      trackEvent("Login", "Wallet", "IsAlreadyOnline");
-      var message = i18n.t("multi_connection");
-
-      bootbox.dialog({
-        title: i18n.t("confirm_connection"),
-        message: message,
-        buttons: {
-          "cancel": {
-            label: i18n.t("cancel"),
-            className: "btn-danger",
-            callback: function() {
-              bootbox.hideAll();
-              self.setExtraInfoOpacity(100);
-              return false;
-            }
-          },
-          "continue": {
-            label: i18n.t("continue"),
-            className: "btn-primary",
-            callback: function() {
-              multiAPINewest("get_preferences", {
-                'wallet_id': WALLET.identifier(),
-                'network': USE_TESTNET ? 'testnet' : 'mainnet',
-                'for_login': true
-              }, 'last_updated', self.onReceivedPreferences);
-            }
-          }
-        }
-      });
-    } else {
-      //Grab preferences
-      multiAPINewest("get_preferences", {
-        'wallet_id': WALLET.identifier(),
-        'network': USE_TESTNET ? 'testnet' : 'mainnet',
-        'for_login': true
-      }, 'last_updated', self.onReceivedPreferences);
-    }
-  }
 
   self.onReceivedPreferences = function(data) {
     $.jqlog.debug('PREFERENCES:');

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -39,7 +39,7 @@
   "open_wallet": "Open Wallet",
   "login": "Login",
   "login_problems": "Problems logging in?",
-  "counterwallet_desc_1": "Counterwallet is a free web-wallet for <a href=\"http://www.counterparty.io\" target=\"_blank\">Counterparty</a>, the world’s first protocol for decentralized financial tools.",
+  "counterwallet_desc_1": "Counterwallet is a free web-wallet for Bitcoin and <a href=\"http://www.counterparty.io\" target=\"_blank\">Counterparty</a>, the world’s first protocol for decentralized financial tools.",
   "counterwallet_desc_2": "All transactions made with Counterwallet use an automatic escrow system to keep them secure, with no middleman required.",
   "counterwallet_desc_3": "Secure",
   "counterwallet_desc_4": "All encryption is handled client-side. Neither your passphrase nor any of your private information ever leaves your browser.",
@@ -90,7 +90,7 @@
   "wallet_options": "Wallet Options",
   "theme": "Theme",
   "language": "Language",
-  "password_field": "Password field",
+  "password_field": "Password for Quick Access URL",
   "auto_btcpay": "Auto BTCPay",
   "enable_auto_btcpay": "Enable Automatic BTC Payments",
   "enable_auto_btcpay_desc": "If this option is enabled, Counterwallet will automatically take care of making BTC payments for matched orders where you owe BTC. <b>It is highly recommended you keep this on.</b> If not enabled, you must manually settle any required BTC payments within a 10 block limit (approximately 80-100 minutes).",
@@ -253,7 +253,7 @@
   "equal": "Equal",
   "notequal": "NotEqual",
   "select_feed": "Select Feed",
-  "target_value": "target_value",
+  "target_value": "Target value",
   "bullcfd": "BullCFD",
   "bearcfd": "BearCFD",
   "enter_bet": "Enter Bet",
@@ -544,7 +544,7 @@
   "label": "Label",
   "cancel": "Cancel",
   "change_label": "Change Label",
-  "enter_address_description": "Enter the description you'd like to use for this new address.<br/><br/> <b class=\"errorColor\">Please NOTE that once you create a new address, you cannot delete it.</b>",
+  "enter_address_description": "Enter the description you'd like to use for this new address.<br/><br/>",
   "enter_address_description_watch_only": "Please enter the info for the address you would like to add into your wallet as a watch-only address.",
   "enter_address_description_armory": "Please enter the info for the address you would like to add into your wallet as an Offline Armory address.",
   "enter_address_description_multisig": "<p>Please enter the the multisig address you would like to add into your wallet</p>",

diff --git a/src/pages/balances.html b/src/pages/balances.html
@@ -87,7 +87,7 @@ <h3 class="jarviswidget-ctrls">
                   <i class="fa fa-bars"></i> <span data-bind="locale: 'address_actions'"></span> <i class="fa fa-caret-down"></i>
                 </button>
                 <ul class="dropdown-menu pull-right">
-                  <li><a data-bind="click: showQRCode, locale: 'show_qr_code'" href="#"></a></li>
+                  <li><a data-bind="click: showQRCode, locale: 'show_qr_code', visible: !IS_MULTISIG_ADDRESS" href="#"></a></li>
                   <li data-bind="visible: IS_NORMAL"><a data-bind="click: showPrivateKey, locale: 'show_private_key'" href="#"></a></li>
                   <li data-bind="visible: IS_NORMAL"><a data-bind="click: signMessage, locale: 'sign_message'" href="#"></a></li>
                   <li data-bind="visible: IS_NORMAL"><a data-bind="click: signTransaction, locale: 'sign_transaction'" href="#"></a></li>
@@ -120,7 +120,7 @@ <h3 class="jarviswidget-ctrls">
                 </ul>
               </div>
             </div>
-            <div class="widget-toolbar display-address"><span id="" data-bind="attr: {'id': 'address-text-' + ADDRESS}, click: selectAddressText, text: dispAddress"></span></div>
+            <div class="widget-toolbar display-address"><span id="" data-bind="attr: {'id': 'address-text-' + ADDRESS}, click: changeLabel, text: dispAddress"></span></div>
             <div class="clearfix"></div>
           </header>
           <div> <!-- widget div-->
@@ -172,7 +172,7 @@ <h4 class="modal-title" data-bind="locale: 'change_address_label'"></h4>
       </div>
       <div class="modal-body no-padding">
         <div class="formPadded">
-          <p data-bind="locale: 'enter_new_label', localeArgs: dispAddress "></p>
+          <p style="word-wrap: break-word;" data-bind="locale: 'enter_new_label', localeArgs: dispAddress "></p>
         </div>
 
         <form class="smart-form" data-bind="submit: doAction"><fieldset>
@@ -273,7 +273,7 @@ <h4 class="modal-title" data-bind="text: dispWindowTitle"></h4>
                 </label>
             </div>
           </div></section>
-          <section data-bind="visible: addressType() == 'multisig' && multisigProvided() == '3' && needPubkey3()"><div class="row">
+          <section data-bind="visible: (addressType() == 'multisig') && (multisigProvided() == '3') && needPubkey3()"><div class="row">
             <label class="control-label col col-sm-2" data-bind="locale: 'third_pubkey'"></label>
             <div class="col col-sm-10">
                 <label class="input"><i class="icon-append fa fa-tag"></i>
@@ -282,7 +282,6 @@ <h4 class="modal-title" data-bind="text: dispWindowTitle"></h4>
             </div>
           </div></section>
 
-
           <section data-bind="visible: addressType() != 'normal' && addressType() != 'multisig'"><div class="row">
             <label class="control-label col col-sm-2" data-bind="locale: 'address'"></label>
             <div class="col col-sm-10">
@@ -301,7 +300,7 @@ <h4 class="modal-title" data-bind="text: dispWindowTitle"></h4>
           </div></section>
         </fieldset></form>
       </div>
-      <div class="modal-footer">
+      <div class="modal-footer" id="createNewAddressButtons">
         <button type="button" class="btn btn-default" data-bind="click: hide, locale: 'cancel'"></button>
         <button type="button" data-bind="click: submitForm, locale: 'create_new_address'" class="btn btn-primary"></button>
       </div>

diff --git a/src/pages/exchange.html b/src/pages/exchange.html
@@ -93,8 +93,8 @@ <h3 data-bind="locale: 'select_another_pair'"></h3>
                       </div>
                     </section>
                     <section class="col col-lg-4 col-sm-4" data-bind="visible: selectedQuoteAsset() == 'Other'">
-                      <div style="padding-top:2px">
-                        <label for="asset2" class="control-label font-medlg">&nbsp;</label>
+                      <div style="padding-top:10px">
+                        <label for="asset2" class="control-label font-medlg" style="display:block">&nbsp;</label>
                         <label class="input">
                             <input type="text" id="asset2" name="asset2" class="form-control input" type="text" placeholder="Asset name" data-bind="value: asset2" />
                         </label>