Merge pull request #8 from XBTS/xbts-staging

Xbts staging > release

.github/pull_request_template.md

@@ -7,7 +7,7 @@ Closes #[Insert issue number]
 Please make sure the following is done:
 
 - Pull request is onto develop
-- If you haven't already, have a look at 
+- If you haven't already, have a look at
   - https://github.com/bitshares/bitshares-ui/blob/develop/CODE_OF_CONDUCT.md
   - https://github.com/bitshares/bitshares-ui/blob/develop/CONTRIBUTING.md
 

.gitignore

@@ -20,3 +20,7 @@ app/stats-dev.json
 app/stats-prod.json
 app/test/MarketClasses.js
 yarn.lock
+charting_library
+!charting_library/*.md5
+!charting_library/install-charting-library.js
+!charting_library/package-charting-library.js

CONTRIBUTING.md

@@ -1,3 +1,10 @@
+## Funding update September 1st
+DUE TO RECENT VOTINGS ON THE NETWORK THE BITSHARES UI WORKER IS OUT OF FUNDS. 
+
+PLEASE [CHECK HERE](https://github.com/bitshares/bitshares-ui/issues/3044) FOR MORE DETAILS AND UPDATES.
+
+-----
+
 Please work off the develop branch and make pull requests to that branch. The master branch will only be updated for new releases.
 
 The Bitshares UI team is supported by this [worker proposal](https://www.bitshares.foundation/workers/2019-02-bitshares-ui). It provides the funds needed to pay for the development team and the community bounties.
@@ -6,24 +13,32 @@ If you would like to get involved, we have a [Telegram chatroom](https://t.me/Bi
 
 ## Development process
 
-- New issues will, after enough discussion and clarification, be assigned an estimate **Quality Hours** development time, as well as assigned to the next milestone, by a project coordinator.
-- Milestones are numbered YYMMDD.
+- We encourage everyoe to participate in issue discussion, especially those that has [not yet been qualified as work](https://github.com/bitshares/bitshares-ui/issues?q=is%3Aopen+is%3Aissue) and [the `Need Discussion` issues](https://github.com/bitshares/bitshares-ui/issues?q=is%3Aissue+is%3Aopen+label%3A%22%5B2%5D+Needs+Discussion%22).
+- New issues will be groomed by a project coordinator to set the issue goal and estimated **Quality Hours** of development time.
+- After a clarified goal issues will be assigned to the [Active Developent milestone](https://github.com/bitshares/bitshares-ui/milestone/52).
+- All non-assigned issues can be found on the the [Active Developent milestone](https://github.com/bitshares/bitshares-ui/milestone/52). or [by filtering the issues list](https://github.com/bitshares/bitshares-ui/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Active+Development%22+no%3Aassignee).
+- Assigned issues will be assigned to a milestone, which will indicate the deadline for the issues.
+- Milestones are numbered YYMMDD and indicates the expected delivery.
 - 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 **Quality Hours** ($125 per hour). If you fix this issue according to these guidelines and your PR is accepted, this will earn you $250 worth of bitCNY. You must have a Bitshares wallet and a Bitshares account to receive payment.
 - Non-code contributions such as translations, documentation work and others may be compensated at a lower hourly rate. This will be clearly stated in the relevant issue.
 
 **IMPORTANT NOTES FOR NEW DEVELOPERS**
 - To claim an issue, simply leave a comment with your request to work on it.
-- Bounty payment is **Quality Hours**, meaning an experienced developer could complete the task within the assigned hours. Inexperienced users may need more time, but still receive the same pay.
-- To make sure no underpayment for development is made, it is important that if an issue would require more **Quality Hours** time, it should be stated clearly in the issue together with a reason and a new estimate.
+- Bounty payment is **Quality Hours**, meaning an experienced developer could complete the task within the assigned hours. Inexperienced users may need more time, to learn the coding standards or practices used on the project, but still receive the same pay.
+- To make sure no underpayment for development is made, it is important that if an issue would require more **Quality Hours** time, it should be stated clearly in the issue together with a reason and a new estimate, which also requires an approval.
 - 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. If extra time is expected, clarify why in the claim. The new estimate will have to be confirmed by a project coordinator.
-- If an issue misses 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 and could result in no bounty pay.
+- If an issue misses 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 will result in release of the assigned issue and could result in no bounty pay.
 - It's the developers responsibility to read comments on submitted PR to make sure merging is possible and issue is closed, failure to do so may result in no bounty pay.
 
 ## Coding style guideline
 
+### Guidelines on UI Related Tasks
+Please review our Wiki on [Guidelines for Issues with UI related work](https://github.com/bitshares/bitshares-ui/wiki/Guidelines-for-Issues-with-UI-related-work)
+
+### General Guidelines
 Our style guideline is based on 'Airbnb JavaScript Style Guide' (https://github.com/airbnb/javascript), with few exceptions:
 
 - Strings are double quoted

LICENSE.md

@@ -1,5 +1,4 @@
 Copyright (c) 2019 The BitShares UI worker and and contributors.
-Copyright (c) 2019 The XBTS UI.
 
 The MIT License
 

README.md

@@ -1,4 +1,4 @@
-XBTS-UI
+BitShares-UI
 ============
 [中文版](README_zh.md)
 
@@ -8,7 +8,7 @@ It *stores all keys locally* in the browser, *never exposing your keys to anyone
 
 ## Getting started
 
-xbts-ui depends node Node.js, and version 8+ 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).
 
@@ -23,8 +23,8 @@ nvm use v9
 Once you have Node installed, you can clone the repo:
 
 ```
-git clone https://github.com/xbts/xbts-ui.git
-cd xbts-ui
+git clone https://github.com/bitshares/bitshares-ui.git
+cd bitshares-ui
 ```
 
 Before launching the GUI you will need to install the npm packages:
@@ -47,7 +47,7 @@ Once the compilation is done the GUI will be available in your browser at: `loca
 
 
 ## Testnet
-By default xbts-ui connects to the live BitShares network, but it's very easy to switch it to the testnet run by Xeroc. To do so, open the UI in a browser, go to Settings, then under Access, select the *Public Testnet Server* in the dropdown menu. You should also change the faucet if you need to create an account, the testnet faucet address is https://testnet.bitshares.eu.
+By default bitshares-ui connects to the live BitShares network, but it's very easy to switch it to the testnet run by Xeroc. To do so, open the UI in a browser, go to Settings, then under Access, select the *Public Testnet Server* in the dropdown menu. You should also change the faucet if you need to create an account, the testnet faucet address is https://testnet.bitshares.eu.
 
 The UI will reload and connect to the testnet, where you can use the faucet to create an account and receive an initial sum of test BTS.
 
@@ -72,11 +72,11 @@ On Linux you will need to install the following packages to handle icon generati
 For building, each architecture has it's own script that you can use to build your native binary:
 
 __Linux__
-`npm run package-deb`
+`npm run package-deb`  
 __Windows__
-`npm run package-win`
+`npm run package-win`  
 __Mac__
-`npm run package-mac`
+`npm run package-mac`  
 
 This will compile the UI with some special modifications for use with Electron, generate installable binaries with Electron and copy the result to the root `build/binaries` folder.
 
@@ -90,12 +90,12 @@ Clone this repository, run `docker-compose up` and visit localhost:8080
 See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## Code of Conduct
-This repository has a Code of Conduct that should be followed by everyone.
+This repository has a Code of Conduct that should be followed by everyone. 
 Please read [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md)
 
 **Please keep comments constructive and clean**
 
-## BrowserStack
+## BrowserStack 
 
 The BitShares UI is integrated with BrowserStack (https://www.browserstack.com) to allow manual compatibility testing across devices and browser versions. In the future we will switch to a automated Selenium testing framework.
 ![image](https://user-images.githubusercontent.com/33128181/48697885-05f8d880-ebe6-11e8-95a2-d87516cbb3d9.png)
@@ -120,7 +120,7 @@ Available for browsing on https://staging.bitshares.org/
 ### Master (stable)
 When all issues to the current RC are fixed, `staging` branch is released to the stable `master` branch.
 
-Available for browsing on https://ex.xbts.io/, which is the official reference wallet for Bitshares.
+Available for browsing on https://wallet.bitshares.org/, which is the official reference wallet for Bitshares.
 
 
 

app/App.jsx

@@ -21,9 +21,7 @@ import titleUtils from "common/titleUtils";
 import {BodyClassName, Notification} from "bitshares-ui-style-guide";
 import {DEFAULT_NOTIFICATION_DURATION} from "services/Notification";
 import Loadable from "react-loadable";
-import Borrow from "./components/Showcases/Borrow";
-import Barter from "./components/Showcases/Barter";
-import DirectDebit from "./components/Showcases/DirectDebit";
+// import NewsHeadline from "components/Layout/NewsHeadline";
 
 import {Route, Switch, Redirect} from "react-router-dom";
 
@@ -118,6 +116,30 @@ const CreateWorker = Loadable({
     loading: LoadingIndicator
 });
 
+const Barter = Loadable({
+    loader: () =>
+        import(/* webpackChunkName: "settings" */ "./components/Showcases/Barter"),
+    loading: LoadingIndicator
+});
+
+const Borrow = Loadable({
+    loader: () =>
+        import(/* webpackChunkName: "settings" */ "./components/Showcases/Borrow"),
+    loading: LoadingIndicator
+});
+
+const Htlc = Loadable({
+    loader: () =>
+        import(/* webpackChunkName: "settings" */ "./components/Showcases/Htlc"),
+    loading: LoadingIndicator
+});
+
+const DirectDebit = Loadable({
+    loader: () =>
+        import(/* webpackChunkName: "settings" */ "./components/Showcases/DirectDebit"),
+    loading: LoadingIndicator
+});
+
 import LoginSelector from "./components/LoginSelector";
 import Login from "./components/Login/Login";
 import RegistrationSelector from "./components/Registration/RegistrationSelector";
@@ -496,6 +518,7 @@ class App extends React.Component {
                                     path="/help/:path1/:path2/:path3"
                                     component={Help}
                                 />
+                                <Route path="/htlc" component={Htlc} />
                                 <Route path="*" component={Page404} />
                             </Switch>
                         </div>

app/actions/AccountActions.js

@@ -42,10 +42,6 @@ class AccountActions {
         return name;
     }
 
-    setNeverShowBrowsingModeNotice(value) {
-        return value;
-    }
-
     tryToSetCurrentAccount() {
         return true;
     }
@@ -190,6 +186,58 @@ class AccountActions {
     setPasswordAccount(account) {
         return account;
     }
+
+    createCommittee({url, account}) {
+        const account_id = account.get("id");
+        var tr = WalletApi.new_transaction();
+
+        tr.add_type_operation("committee_member_create", {
+            fee: {
+                amount: 0,
+                asset_id: "1.3.0"
+            },
+            committee_member_account: account_id,
+            url: url
+        });
+        return dispatch => {
+            return WalletDb.process_transaction(tr, null, true)
+                .then(() => {
+                    dispatch(true);
+                })
+                .catch(error => {
+                    console.log(
+                        "----- Add Committee member error ----->",
+                        error
+                    );
+                    dispatch(false);
+                });
+        };
+    }
+
+    createWitness({url, account, signingKey}) {
+        const account_id = account.get("id");
+        var tr = WalletApi.new_transaction();
+
+        tr.add_type_operation("witness_create", {
+            fee: {
+                amount: 0,
+                asset_id: "1.3.0"
+            },
+            witness_account: account_id,
+            url: url,
+            block_signing_key: signingKey
+        });
+        return dispatch => {
+            return WalletDb.process_transaction(tr, null, true)
+                .then(() => {
+                    dispatch(true);
+                })
+                .catch(error => {
+                    console.log("----- Create witness error ----->", error);
+                    dispatch(false);
+                });
+        };
+    }
 }
 
 export default alt.createActions(AccountActions);