Merge branch 'bitshares' into RUBLE

blckchnd · Apr 11, 2017 · b7ac159 · b7ac159
2 parents c107f47 + e353521
commit b7ac159
Show file tree

Hide file tree

Showing 35 changed files with 588 additions and 216 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,32 @@ Release 2.0.170327
 ---------------------------------------------------------------------
 New features
 --------
+- Allow the mini depth chart to be hidden by the user
+- Refactor the MyMarkets component, 'show star only' and revamped search
+- Display up to 20 rows of the orderbook by default instead of 10
+- Add Trade and Borrow links to the default assets in AccountOverview
+
+Bug fixes
+--------
+- Fix an issue with blocktrades deposit addresses being set incorrectly
+- Change positioning of some tooltips
+- Fix password score checker freezing on very long passwords
+- Hide 'something for nothing order history items
+- Update bitsharesjs to fix proposals array undefined error
+- Fix 'Cannot use 'in' operator to search for 'translate'' error in api dropdown
+- Fix order rounding when modifying the 'Total' after clicking an order from the orderbook
+- Improve first-time brainkey lookup to check at least 10 positions
+- Log pub keys when creating a new account
+- Fix some Account permissions css issues and add some loggin
+- Also check if generated active key matches owner key and vice versa
+- Fix account create with faucet not rejecting errors properly
+- Fix password strength meter turning red for long passwords
+- Fix gateway actions in progress return
+---------------------------------------------------------------------
+Release 2.0.170327
+---------------------------------------------------------------------
+New features
+--------
 - Add password based login using account+role+password as private key seed
 - Add a Migration option to add password based keys to an existing account
 - Add password strength checker to password input

diff --git a/electron/build/package.json b/electron/build/package.json
@@ -3,7 +3,7 @@
   "productName": "RuDEX-light",
   "identifier": "org.rudex.market",
   "description": "RuDEX - cryptocurrency and decentralized exchange",
-  "version": "2.0.170328",
+  "version": "2.0.170410",
   "author": "[email protected]",
   "main": "electron.js",
   "config": {

diff --git a/web/app/actions/AssetActions.js b/web/app/actions/AssetActions.js
@@ -269,7 +269,8 @@ class AssetActions {
         return (dispatch) => {
             if (!inProgress[id]) {
                 inProgress[id] = true;
-                Apis.instance().db_api().exec("list_assets", [
+                dispatch({loading: true});
+                return Apis.instance().db_api().exec("list_assets", [
                     start, count
                 ]).then(assets => {
                     let bitAssetIDS = [];
@@ -301,13 +302,16 @@ class AssetActions {
                         dispatch({
                             assets: assets,
                             dynamic_data: results[0],
-                            bitasset_data: results[1]
+                            bitasset_data: results[1],
+                            loading: false
                         });
+                        return assets && assets.length;
 
                     });
                 })
                 .catch(error => {
                     console.log("Error in AssetStore.getAssetList: ", error);
+                    dispatch({loading: false});
                     delete inProgress[id];
                 });
             }

diff --git a/web/app/actions/MarketsActions.js b/web/app/actions/MarketsActions.js
@@ -460,6 +460,10 @@ class MarketsActions {
         };
     }
 
+    toggleStars() {
+        return true;
+    }
+
 }
 
 export default alt.createActions(MarketsActions);
diff --git a/web/app/actions/SettingsActions.js b/web/app/actions/SettingsActions.js
@@ -22,6 +22,10 @@ class SettingsActions {
         return {quote, base};
     }
 
+    setUserMarket(quote, base, value) {
+        return {quote, base, value};
+    }
+
     addStarAccount(account) {
         return account;
     }

diff --git a/web/app/assets/locales/locale-cn.json b/web/app/assets/locales/locale-cn.json
@@ -893,7 +893,11 @@
     "settings": "图表选项",
     "featured": "热门市场",
     "new": "新增",
-    "market_frozen": "%(asset)s 资产发行人已禁用该资产的市场交易"
+    "market_frozen": "%(asset)s 资产发行人已禁用该资产的市场交易",
+    "show_star_1": "Show",
+    "show_star_2": "only",
+    "base": "Base currency:",
+    "search": "Search for more markets here"
   },
   "markets": {
     "title": "交易所",

diff --git a/web/app/assets/locales/locale-de.json b/web/app/assets/locales/locale-de.json
@@ -730,7 +730,11 @@
     "no_balance": "Ungenügendes Guthaben",
     "invalid_amount": "Ungültiger Betrag",
     "invalid_price": "Ungültiger Preis",
-    "market_frozen": "The owner of %(asset)s has disabled trading in this market."
+    "market_frozen": "The owner of %(asset)s has disabled trading in this market.",
+    "show_star_1": "Show",
+    "show_star_2": "only",
+    "base": "Base currency:",
+    "search": "Search for more markets here"
   },
   "fees": {
     "title": "Gebühren"

diff --git a/web/app/assets/locales/locale-en.json b/web/app/assets/locales/locale-en.json
@@ -892,7 +892,11 @@
     "settings": "Chart options",
     "featured": "Top Markets",
     "new": "New",
-    "market_frozen": "The owner of %(asset)s has disabled trading in this market."
+    "market_frozen": "The owner of %(asset)s has disabled trading in this market.",
+    "show_star_1": "Show",
+    "show_star_2": "only",
+    "base": "Base currency:",
+    "search": "Search for more markets here"
   },
   "fees": {
     "title": "Fee Schedule"

diff --git a/web/app/assets/locales/locale-es.json b/web/app/assets/locales/locale-es.json
@@ -580,7 +580,11 @@
     "horizontal": "Horizontal",
     "confirm_buy": "Your order is %(diff)s times higher than the lowest ask, are you sure?",
     "confirm_sell": "Your order is %(diff)s times lower than the highest bid, are you sure?",
-    "market_frozen": "The owner of %(asset)s has disabled trading in this market."
+    "market_frozen": "The owner of %(asset)s has disabled trading in this market.",
+    "show_star_1": "Show",
+    "show_star_2": "only",
+    "base": "Base currency:",
+    "search": "Search for more markets here"
   },
   "markets": {
     "base": "Activo base",

diff --git a/web/app/assets/locales/locale-fr.json b/web/app/assets/locales/locale-fr.json
@@ -440,7 +440,11 @@
     "sell": "Vendre",
     "confirm_buy": "Your order is %(diff)s times higher than the lowest ask, are you sure?",
     "confirm_sell": "Your order is %(diff)s times lower than the highest bid, are you sure?",
-    "market_frozen": "The owner of %(asset)s has disabled trading in this market."
+    "market_frozen": "The owner of %(asset)s has disabled trading in this market.",
+    "show_star_1": "Show",
+    "show_star_2": "only",
+    "base": "Base currency:",
+    "search": "Search for more markets here"
   },
   "markets": {
     "choose_base": "Selectionner l'actif de base",

diff --git a/web/app/assets/locales/locale-ko.json b/web/app/assets/locales/locale-ko.json
@@ -584,7 +584,11 @@
     "market_name": "종목명",
     "quote_supply": "유통량",
     "base_supply": "유통량",
-    "market_frozen": "The owner of %(asset)s has disabled trading in this market."
+    "market_frozen": "The owner of %(asset)s has disabled trading in this market.",
+    "show_star_1": "Show",
+    "show_star_2": "only",
+    "base": "Base currency:",
+    "search": "Search for more markets here"
   },
   "markets": {
     "base": "기초 자산",

diff --git a/web/app/assets/locales/locale-ru.json b/web/app/assets/locales/locale-ru.json
@@ -1227,4 +1227,4 @@
     "disabled":"Чат отключен",
     "enable":"Включить чат"
   }
-}
+}
diff --git a/web/app/assets/locales/locale-tr.json b/web/app/assets/locales/locale-tr.json
@@ -23,9 +23,12 @@
     "update_asset": "Dijital Varlık Güncelle",
     "lock": "Kilitle",
     "unlock": "Kilidi Aç",
+    "unlock_password": "Giriş yap",
+    "unlock_short": "Giriş",
     "help": "Yardım",
     "locked_tip": "Cüzdan kilitli.<br/>Açmak için tıkla.",
-    "unlocked_tip": "Cüzdan kilidi açık .<br/>Kilitlemek için tıkla."
+    "unlocked_tip": "Cüzdan kilidi açık .<br/>Kilitlemek için tıkla.",
+    "account_notify": "Aktif hesap: %(account)s"
   },
   "tooltip": {
     "call_limit": "Piyasadaki en az teminatlı marjin pozisyonunun itfa fiyatı",
@@ -58,6 +61,14 @@
   "propose": "Teklif Et",
   "cancel": "İptal",
   "account": {
+    "intro_text_title": "Bitshares'e Hoş Geldiniz",
+    "intro_text_1": "<b>Bitshares Merkezsiz Kriptopara Borsası</b> (BMKB) kripto para al-sat deneyiminizi kökten değiştirecek, yeni nesil bir borsa platformudur.",
+    "intro_text_2": "<b>Bitshares</b>'de al-sat işlemleri herhangi bir aracı olmaksızın, doğrudan kullanıcıların kendi arasında gerçekleşir.",
+    "intro_text_3": "Platform üzerinde kullanıcılar kendi hesaplarının tam kontrolüne sahiptir - hiçbir aracı kurum işlemlerinize müdahale edemez!",
+    "intro_text_4": "Platformda BTC, ETH, STEEM, DASH, LTC, DOGE gibi coin'lerle işlem yapabileceğiniz gibi aynı zamanda kendi coin'inizi oluşturabilir ve hemen ticaretine başlayabilirsiniz.",
+    "in_open": "Bekleyen emirlerinizdeki %(asset)s miktarı: ",
+    "in_open_value": "%(asset)s piyasasındaki bekleyen emirlerin büyüklüğü (anlık değere göre): ",
+    "password_login": "Giriş yap",
     "transfer_actions": "Transfer işlemleri",
     "market_actions": "Takas işlemleri",
     "see_open": "Bekleyen emirler",
@@ -856,7 +867,12 @@
     "zoom_all": "Tümü",
     "settings": "Çizelge tercihleri",
     "featured": "Öne Çıkan Piyasalar",
-    "new": "Yeni"
+    "new": "Yeni",
+    "market_frozen": "The owner of %(asset)s has disabled trading in this market.",
+    "show_star_1": "Show",
+    "show_star_2": "only",
+    "base": "Base currency:",
+    "search": "Search for more markets here"
   },
   "fees": {
     "title": "Ücret Tarifesi"
@@ -893,6 +909,7 @@
     "has_wallet": "Bitshares hesabı açtığınızda cüzdanınızın kontrolü tamamen size aittir. Bir başka kişi sizin cüzdanınızı kontrol edemez. Cüzdana erişim için gerekli olan TekAnahtar bilgisayarınızda şifreli olarak saklanır.",
     "create_account_text": "Hesabınıza ait .bin dosyasını kaybetmeniz, veya TekAnahtarı ya da şifrenizi unutmanız durumunda hesabınıza erişmenin hiçbir yolu yoktur. Bu yüzden, bir sonraki adımda cüzdanınızı yedeklemeli ve .bin dosyanızı, şifrenizi ve TekAnahtarınızı kesinlikle kaybetmemelisiniz.",
     "first_account_paid": "TekAnahtarınızı, şifrenizi veya .bin dosyasını güvende tutmazsanız, bilgisayarınızda oluşacak herhangi bir sorun ya da güncelleme nedeniyle cüzdanınıza erişimi kaybedebilirsiniz. Bu durumda cüzdanınızdaki dijital varlıkları geri getirmenin hiçbir yolu yoktur.",
+    "not_first_account": "Zaten bir Bitshares hesabı ile giriş yapılmış, bu yüzden yeni oluşturacağınız her hesap için ağ ücreti ödemeniz gerekmektedir.",
     "import_backup_choose": "Lütfen yedekleme dosyasını seçin. Bu işlem esnasında dosya kendi bilgisayarınızdan dışarıya asla aktarılmaz, bütün işlem bilgisayarınızda gerçekleşir.",
     "import_balance": "Bakiyeyi aktar.",
     "import_key_success": "İşleminiz başarıyla tamamlandı!",

diff --git a/web/app/assets/stylesheets/components/_forms.scss b/web/app/assets/stylesheets/components/_forms.scss
@@ -49,6 +49,11 @@ div.account-image {
     }
 }
 
+.asset-selector {
+    .error-area {
+        position: absolute;
+    }
+}
 .account-selector, .pubkey-input {
   clear: right;
   input {

diff --git a/web/app/components/Account/CreateAccountPassword.jsx b/web/app/components/Account/CreateAccountPassword.jsx
@@ -186,17 +186,14 @@ class CreateAccountPassword extends React.Component {
                 />
 
                 {/* Only ask for password if a wallet already exists */}
-                {hasWallet ?
-                    null :
-                        <PasswordInput
-                            ref="password"
-                            confirmation={true}
-                            onChange={this.onPasswordChange.bind(this)}
-                            noLabel
-                            passwordLength={12}
-                            checkStrength
-                        />
-                }
+                <PasswordInput
+                    ref="password"
+                    confirmation={true}
+                    onChange={this.onPasswordChange.bind(this)}
+                    noLabel
+                    passwordLength={12}
+                    checkStrength
+                />
 
                 {/* If this is not the first account, show dropdown for fee payment account */}
                 {

diff --git a/web/app/components/Dashboard/Dashboard.jsx b/web/app/components/Dashboard/Dashboard.jsx
@@ -31,25 +31,28 @@ class Dashboard extends React.Component {
                 ["BTS", "GOLOS"]
             ],
             "4018d784xback":[
+                ["USD", "BTS"],
+                ["USD", "OPEN.BTC"],
+                ["USD", "OPEN.USDT"],
+                ["USD", "OPEN.ETH"],
+                ["USD", "OPEN.DASH"],
                 ["BTS", "CNY"],
                 ["CNY", "OPEN.BTC"],
                 ["CNY", "USD"],
-                ["USD", "BTS"],
+                ["CNY", "OPEN.ETH"],
                 ["OPEN.BTC", "BTS"],
-                ["USD", "OPEN.BTC"],
-                ["USD", "OPEN.USDT"],
                 ["OPEN.BTC", "OPEN.DASH"],
-                ["USD", "OPEN.DASH"],
                 ["BTS", "GOLD"],
                 ["BTS", "BLOCKPAY"],
                 ["OPEN.BTC", "BLOCKPAY"],
+                ["BTS", "BTWTY"],
                 ["BTS", "OBITS"],
                 ["KAPITAL", "OPEN.BTC"],
                 ["BTS", "SILVER"],
                 ["OPEN.BTC", "OPEN.DGD"],
                 ["USD", "OPEN.STEEM"],
-                ["USD", "OPEN.ETH"],
-                ["BTS", "BTWTY"],
+                ["USD", "OPEN.MAID"],
+                ["USD", "GOLD"],
                 ["BTS", "OPEN.ETH"],
                 ["BTS", "ICOO"],
                 ["OPEN.BTC", "OPEN.STEEM"],
@@ -62,7 +65,7 @@ class Dashboard extends React.Component {
                 ["BTS", "OPEN.INCENT"],
                 ["OPEN.BTC", "OBITS"],
                 ["HEMPSWEET", "OPEN.BTC"],
-                ["KAPITAL", "BTS"]
+                ["KAPITAL", "BTS"],
             ],
             "39f5e2ed": [
                 ["TEST", "PEG.FAKEUSD"],

diff --git a/web/app/components/Dashboard/MarketCard.jsx b/web/app/components/Dashboard/MarketCard.jsx
@@ -101,7 +101,7 @@ class MarketCard extends React.Component {
                     </div>
                 </div>
                 <div className="grid-block vertical no-overflow">
-                    <div className="fm-name"><AssetName name={base.get("symbol")} /> : <AssetName name={quote.get("symbol")} /></div>
+                    <div className="fm-name"><AssetName dataPlace="top" name={base.get("symbol")} /> : <AssetName dataPlace="top" name={quote.get("symbol")} /></div>
                     {/* <div className="fm-volume">price: <div className="float-right">{(!marketStats || !marketStats.close) ? null : utils.format_price(
                         marketStats.close.quote.amount,
                         base,

diff --git a/web/app/components/Dashboard/SimpleDepositBlocktradesBridge.jsx b/web/app/components/Dashboard/SimpleDepositBlocktradesBridge.jsx
@@ -44,7 +44,6 @@ class SimpleDepositBlocktradesBridge extends React.Component {
         this._validateAddress(this.state.toAddress, props);
 
         this.deposit_address_cache = new BlockTradesDepositAddressCache();
-        this.addDepositAddress = this.addDepositAddress.bind(this);
     }
 
     componentWillMount() {
@@ -64,6 +63,16 @@ class SimpleDepositBlocktradesBridge extends React.Component {
         }
     }
 
+    shouldComponentUpdate(np, ns) {
+        return (
+            np.inputCoinType !== this.props.inputCoinType ||
+            np.outputCoinType !== this.props.outputCoinType ||
+            np.sender !== this.props.sender ||
+            np.asset !== this.props.asset ||
+            !utils.are_equal_shallow(ns, this.state)
+        );
+    }
+
     _getDepositLimit(props = this.props) {
         this.setState({limitLoading: true});
         getDepositLimit(props.inputCoinType, props.outputCoinType).then(res => {
@@ -104,31 +113,37 @@ class SimpleDepositBlocktradesBridge extends React.Component {
         );
         if (!receive_address) {
             this.setState({receive_address: null});
-            requestDepositAddress(this._getDepositObject());
+            requestDepositAddress(this._getDepositObject(props));
         } else {
             this.setState({
                 receive_address
             });
         }
     }
 
-    _getDepositObject() {
+    _getDepositObject(props = this.props) {
         return {
-            inputCoinType: this.props.inputCoinType.toLowerCase(),
-            outputCoinType: this.props.outputCoinType.toLowerCase(),
-            outputAddress: this.props.sender.get("name"),
+            inputCoinType: props.inputCoinType.toLowerCase(),
+            outputCoinType: props.outputCoinType.toLowerCase(),
+            outputAddress: props.sender.get("name"),
             url: blockTradesAPIs.BASE,
-            stateCallback: this.addDepositAddress
+            stateCallback: (receive_address) => {
+                this.addDepositAddress(
+                    props.inputCoinType.toLowerCase(),
+                    props.outputCoinType.toLowerCase(),
+                    props.sender.get("name"),
+                    receive_address
+                );
+            }
         };
     }
 
-    addDepositAddress( receive_address ) {
-        let account_name = this.props.sender.get("name");
+    addDepositAddress( input_coin_type, output_coin_type, account, receive_address ) {
         this.deposit_address_cache.cacheInputAddress(
             "blocktrades",
-            account_name,
-            this.props.inputCoinType.toLowerCase(),
-            this.props.outputCoinType.toLowerCase(),
+            account,
+            input_coin_type,
+            output_coin_type,
             receive_address.address,
             receive_address.memo
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -1227,4 +1227,4 @@ @@
         "disabled":"Чат отключен",
         "enable":"Включить чат"
       }
-    }
+    }