Merge branch 'staging'

# Conflicts: # app/assets/locales/locale-de.json # app/assets/locales/locale-en.json # app/assets/locales/locale-fr.json # app/assets/locales/locale-ko.json # app/assets/locales/locale-ru.json # app/branding.js # package-lock.json # package.json Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
bitshares · Oct 31, 2018 · eb3f77d · eb3f77d
2 parents 00fec97 + fd6252f
commit eb3f77d
Show file tree

Hide file tree

Showing 213 changed files with 24,740 additions and 7,483 deletions.
diff --git a/README.md b/README.md
@@ -9,16 +9,16 @@ It *stores all keys locally* in the browser, *never exposing your keys to anyone
 
 ## Getting started
 
-BitShares-UI depends node Node.js, and version 6+ is required.
+BitShares-UI depends node Node.js, and version 8+ is required.
 
 On Ubuntu and OSX, the easiest way to install Node is to use the [Node Version Manager](https://github.com/creationix/nvm).
 
 To install NVM for Linux/OSX, simply copy paste the following in a terminal:
 
 ```
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
-nvm install v6
-nvm use v6
+nvm install v9
+nvm use v9
 ```
 
 Once you have Node installed, you can clone the repo:
@@ -84,7 +84,7 @@ This will compile the UI with some special modifications for use with Electron,
 
 ### Docker
 
-Clone this repository, run `docker-compose up` and visit localhost:8080 
+Clone this repository, run `docker-compose up` and visit localhost:8080
 
 
 ## Contributing
@@ -106,19 +106,19 @@ If you would like to get involved, we have a [Telegram chatroom](https://t.me/Bi
 - Bugs are always worked before enhancements
 - Developers should work each issue according to a numbered branch corresponding to the issue `git checkout -b 123`
 - We pay **bounties** for issues that have been estimated. An estimated issue is prefixed with a number in brackets like this: `[2] An nasty bug`. In this example, the bug is valued at two hours ($125 per hour). If you fix this issue according to these guidelines and your PR is accepted, this will earn you $250 bitUSD. You must have a Bitshares wallet and a Bitshares account to receive payment.
-- To claim an issue, simply leave a comment with your request to work on it. 
+- To claim an issue, simply leave a comment with your request to work on it.
 - If an issue is already claimed (assigned), do not attempt to claim it. Issues claimed by outside developers will have no assigned dev, but have the developers name in brackets.
 - Do not claim an issue if you will be unable to complete it by the date indicated on the Milestone name. Milestone 170901 will be pushed on September 1, 2017.
 - If an issue missed the intended milestone completion, be sure to make a comment on your progress including the reason for the delay. The issue is pushed to the next milestone. Failing to comment or complete the issue once more will result in release of the assigned issue.
 
 **Please keep comments constructive and clean**
 
 ## Release Branches
-Development is processed through milestones, by 2 week intervals. 
+Development is processed through milestones, by 2 week intervals.
 There are three branches that forms the current release process.
 
 ### Develop
-All PRs should be pushed to the `develop` branch. At the end of each milestone this branch is pushed to `staging`. 
+All PRs should be pushed to the `develop` branch. At the end of each milestone this branch is pushed to `staging`.
 New commits are automatically deployed to this branch and published for review.
 
 Available for browsing on https://develop.bitshares.org/

diff --git a/README_zh.md b/README_zh.md
@@ -7,16 +7,16 @@ BitShares-UI
 
 ## 项目依赖
 
-BitShares-UI 依赖于 Node.js v6 以上版本。
+BitShares-UI 依赖于 Node.js v9 以上版本。
 
 在 Linux 和 macOS 上，安装 Node 最简单的方式是用 [NVM](https://github.com/creationix/nvm)。
 
 将以下命令复制到终端中执行即可安装 NVM。
 
 ```
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
-nvm install v6
-nvm use v6
+nvm install v9
+nvm use v9
 ```
 
 Node 安装完成后，获取项目的源代码：

diff --git a/app/App.jsx b/app/App.jsx
@@ -18,7 +18,8 @@ import Incognito from "./components/Layout/Incognito";
 import {isIncognito} from "feature_detect";
 import {updateGatewayBackers} from "common/gatewayUtils";
 import titleUtils from "common/titleUtils";
-import {BodyClassName} from "bitshares-ui-style-guide";
+import {BodyClassName, Notification} from "bitshares-ui-style-guide";
+import {DEFAULT_NOTIFICATION_DURATION} from "services/Notification";
 import Loadable from "react-loadable";
 
 import {Route, Switch} from "react-router-dom";
@@ -115,6 +116,10 @@ const CreateWorker = Loadable({
 });
 
 import LoginSelector from "./components/LoginSelector";
+import Login from "./components/Login/Login";
+import RegistrationSelector from "./components/Registration/RegistrationSelector";
+import WalletRegistration from "./components/Registration/WalletRegistration";
+import AccountRegistration from "./components/Registration/AccountRegistration";
 import {CreateWalletFromBrainkey} from "./components/Wallet/WalletCreate";
 
 class App extends React.Component {
@@ -128,6 +133,7 @@ class App extends React.Component {
                 ? true
                 : false;
         this.state = {
+            isBrowserSupportModalVisible: false,
             loading: false,
             synced: this._syncStatus(),
             syncFail,
@@ -140,6 +146,14 @@ class App extends React.Component {
         this._chainStoreSub = this._chainStoreSub.bind(this);
         this._syncStatus = this._syncStatus.bind(this);
         this._getWindowHeight = this._getWindowHeight.bind(this);
+
+        this.showBrowserSupportModal = this.showBrowserSupportModal.bind(this);
+        this.hideBrowserSupportModal = this.hideBrowserSupportModal.bind(this);
+
+        Notification.config({
+            duration: DEFAULT_NOTIFICATION_DURATION,
+            top: 90
+        });
     }
 
     componentWillUnmount() {
@@ -184,6 +198,18 @@ class App extends React.Component {
         }
     }
 
+    hideBrowserSupportModal() {
+        this.setState({
+            isBrowserSupportModalVisible: false
+        });
+    }
+
+    showBrowserSupportModal() {
+        this.setState({
+            isBrowserSupportModalVisible: true
+        });
+    }
+
     _syncStatus(setState = false) {
         let synced = this.getBlockTimeDelta() < 5;
         if (setState && synced !== this.state.synced) {
@@ -221,7 +247,7 @@ class App extends React.Component {
                 user_agent.indexOf("edge") > -1
             )
         ) {
-            this.refs.browser_modal.show();
+            this.showBrowserSupportModal();
         }
 
         this.props.history.listen(this._rebuildTooltips);
@@ -366,6 +392,22 @@ class App extends React.Component {
                                     path="/create-account"
                                     component={LoginSelector}
                                 />
+                                <Route path="/login" component={Login} />
+                                <Route
+                                    path="/registration"
+                                    exact
+                                    component={RegistrationSelector}
+                                />
+                                <Route
+                                    path="/registration/local"
+                                    exact
+                                    component={WalletRegistration}
+                                />
+                                <Route
+                                    path="/registration/cloud"
+                                    exact
+                                    component={AccountRegistration}
+                                />
                                 <Route path="/news" exact component={News} />
 
                                 {/* Explorer routes */}
@@ -472,7 +514,11 @@ class App extends React.Component {
                         <TransactionConfirm />
                         <BrowserNotifications />
                         <WalletUnlockModal />
-                        <BrowserSupportModal ref="browser_modal" />
+                        <BrowserSupportModal
+                            visible={this.state.isBrowserSupportModalVisible}
+                            hideModal={this.hideBrowserSupportModal}
+                            showModal={this.showBrowserSupportModal}
+                        />
                     </div>
                 </BodyClassName>
             </div>

diff --git a/app/AppInit.jsx b/app/AppInit.jsx
@@ -10,6 +10,7 @@ import alt from "alt-instance";
 import {connect, supplyFluxContext} from "alt-react";
 import {IntlProvider} from "react-intl";
 import willTransitionTo from "./routerTransition";
+import {BodyClassName} from "bitshares-ui-style-guide";
 import LoadingIndicator from "./components/LoadingIndicator";
 import InitError from "./components/InitError";
 import SyncError from "./components/SyncError";
@@ -124,7 +125,9 @@ class AppInit extends React.Component {
                             ) : syncError ? (
                                 <SyncError />
                             ) : (
-                                <InitError />
+                                <BodyClassName className={theme}>
+                                    <InitError />
+                                </BodyClassName>
                             )}
                         </div>
                     </div>

diff --git a/app/actions/AccountActions.js b/app/actions/AccountActions.js
@@ -42,6 +42,10 @@ class AccountActions {
         return name;
     }
 
+    setNeverShowBrowsingModeNotice(value) {
+        return value;
+    }
+
     tryToSetCurrentAccount() {
         return true;
     }

diff --git a/app/actions/BackupActions.js b/app/actions/BackupActions.js
@@ -11,7 +11,8 @@ class BackupActions {
             reader.onload = evt => {
                 let contents = new Buffer(evt.target.result, "binary");
                 let name = file.name;
-                let last_modified = file.lastModifiedDate.toString();
+
+                let last_modified = new Date(file.lastModified).toString();
 
                 dispatch({name, contents, last_modified});
             };

diff --git a/app/api/ApplicationApi.js b/app/api/ApplicationApi.js
@@ -1,5 +1,4 @@
 import WalletUnlockActions from "actions/WalletUnlockActions";
-import notify from "actions/NotificationActions";
 import WalletDb from "stores/WalletDb";
 import {
     Aes,
@@ -10,6 +9,7 @@ import {
     ChainStore
 } from "bitsharesjs";
 import counterpart from "counterpart";
+import {Notification} from "bitshares-ui-style-guide";
 
 const ApplicationApi = {
     create_account(
@@ -147,12 +147,10 @@ const ApplicationApi = {
                     );
 
                     if (!memo_from_privkey) {
-                        notify.addNotification({
+                        Notification.error({
                             message: counterpart.translate(
                                 "account.errors.memo_missing"
-                            ),
-                            level: "error",
-                            autoDismiss: 10
+                            )
                         });
                         throw new Error(
                             "Missing private memo key for sender: " +

diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js
@@ -185,71 +185,71 @@ export const settingsAPIs = {
             url: "wss://status200.bitshares.apasia.tech/ws",
             location: "New Jersey",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
             url: "wss://new-york.bitshares.apasia.tech/ws",
             location: "New York",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
             url: "wss://dallas.bitshares.apasia.tech/ws",
             location: "Dallas",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
             url: "wss://chicago.bitshares.apasia.tech/ws",
             location: "Chicago",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
             url: "wss://atlanta.bitshares.apasia.tech/ws",
             location: "Atlanta",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
             url: "wss://us-la.bitshares.apasia.tech/ws",
             location: "Los Angeles",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
             url: "wss://seattle.bitshares.apasia.tech/ws",
             location: "Seattle",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
             url: "wss://miami.bitshares.apasia.tech/ws",
             location: "Miami",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
             url: "wss://valley.bitshares.apasia.tech/ws",
             location: "Silicone Valley",
             country: "U.S.A.",
-            region: "Central America",
+            region: "Northern America",
             operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
@@ -621,15 +621,15 @@ export const settingsAPIs = {
         {
             url: "wss://us-east-1.bts.crypto-bridge.org",
             region: "Northern America",
-            country: "United States of America",
+            country: "U.S.A.",
             location: "North Virginia",
             operator: "CryptoBridge",
             contact: "email:support@crypto-bridge.org"
         },
         {
             url: "wss://us-west-1.bts.crypto-bridge.org",
             region: "Northern America",
-            country: "United States of America",
+            country: "U.S.A.",
             location: "North California",
             operator: "CryptoBridge",
             contact: "email:support@crypto-bridge.org"

diff --git a/app/assets/bin-file/default.svg b/app/assets/bin-file/default.svg
diff --git a/app/assets/bin-file/downloaded.svg b/app/assets/bin-file/downloaded.svg