Merge branch 'staging'

.prettierignore

@@ -1,3 +1,4 @@
 *.md
 package.json
 package-lock.json
+charting_library

.travis.yml

@@ -10,6 +10,7 @@ env:
   global:
   - GITHUB_REPO: bitshares/bitshares-ui
   - WALLET_REPO: bitshares/wallet.bitshares.org
+  - STAGING_REPO: bitshares/bitshares-ui-staging
   - CXX=g++-4.8
   - secure: "deD+B8xDM7cguX+PbeOSLh30mi6gHAdlqQphP63ZSCuFbL6hQU7MMb8nmBdBpIuaG2rX5GejSqPWTKt+/MSgQNHMTvRnzG1l1JtDTEAky8ssMyxI+HWiRe7Ic+1pFR0qUBAcPVN3MgPtW3Za47v1IyDyaR/0GdSREdy2KvmwBOWMoT23ubA1QlEhFO7uOlium4gJ6trxNPwfXkNHiMzanpVFyRQljY1PNGEPRzRzyWPNvZ4Pq5yNKnFFcW+afhvsTtK8AoeMFDeKhDF2yva8U0IMCZzrSKWwCIhkhJPii7pPT2LNlpjwVKXn16dRRVKO2tImmWtMpgbJjiNTRzVC4Y30+F7XPc97SpTKfGvoaH/iSZpTT1la0gHgoeBB32y6buPKnF7M2UNwTt2eGXpg/JHyperyQ25ey9EQBk/vHNxS9M3jcfkoXneBOnwICHgrzfamHxmMsiXnNDDriyPqIY9kFGQubqEF74cvBxhPLmfxJCPyHx7BY9ioiAlcgzWqJDOp/ADLjpoh44rUCpQH26Zg0N9efOuLUhuTAa54/9rboWZLxjxEvJ5qfTe+eHMW1r2RzoMJqWOhkbMs4f/qqGY42nqWhiibdSAZzIBuPYt/m9kdQ33930dKWoIkJwqZ2Il+T3FWJtzaguuoxKKYzsok9c/6FY7MbSSPaPw+fjg="
 cache:

CHANGELOG.md

@@ -1,3 +1,35 @@
+---------------------------------------------------------------------
+Release 2.0.180525
+---------------------------------------------------------------------
+New features
+--------
+- Push new staging builds to https://staging.bitshares.org using Travis
+- #905: Replace react-stockcharts with TradingView charts
+- #1512: Add QR scanner on withdraw (beta)
+- #1448: Display walkthrough when user opens exchange for the first time
+- #1447: Implement popup hint message for Icons all around the UI
+- #1482: Revamped and improved Proposed Transactions tab
+
+Bug fixes and improvements
+--------
+- List some open assets from Openledger (#1554)
+- #1184: React v16 upgrade
+- #1502: Remove HighStock imports as it is no longer needed
+- #1502: Update lodash to v4
+- #1502: Webpack v4 upgrade
+- Fix #1527: Sort orderbook asks properly
+- Fix #1533
+- #1534: Use correct asset precision for Core Exchange Rate update
+- #1535: Enable asset links in transactions
+- Fix #1528: Proposed transactions not updating properly in the ChainStore
+- #1507: Withdraw/Deposit Modal Fixes
+- Fix #1517: Remove hardcoded network fee percentage
+- Fix #1397: Order Expiration Date bug
+- Added DGB, SCR, HERTZ images
+- Update Russian locale file
+- Fix #1516: Exchange header tooltip issue
+- #1515: Add script to fix all locale files
+
 ---------------------------------------------------------------------
 Release 2.0.180509
 ---------------------------------------------------------------------

app/App.jsx

@@ -1,5 +1,6 @@
-import {ChainStore} from "bitsharesjs/es";
+import {hot} from "react-hot-loader";
 import React from "react";
+import {ChainStore} from "bitsharesjs/es";
 import IntlStore from "stores/IntlStore";
 import AccountStore from "stores/AccountStore";
 import SettingsStore from "stores/SettingsStore";
@@ -25,6 +26,7 @@ import Incognito from "./components/Layout/Incognito";
 import {isIncognito} from "feature_detect";
 import {updateGatewayBackers} from "common/gatewayUtils";
 import titleUtils from "common/titleUtils";
+import PropTypes from "prop-types";
 
 class App extends React.Component {
     constructor(props) {
@@ -320,8 +322,8 @@ RootIntl = connect(RootIntl, {
 
 class Root extends React.Component {
     static childContextTypes = {
-        router: React.PropTypes.object,
-        location: React.PropTypes.object
+        router: PropTypes.object,
+        location: PropTypes.object
     };
 
     componentDidMount() {
@@ -350,4 +352,5 @@ class Root extends React.Component {
     }
 }
 
-export default supplyFluxContext(alt)(Root);
+Root = supplyFluxContext(alt)(Root);
+export default hot(module)(Root);