Merge branch 'develop' into staging

# Conflicts: # app/assets/stylesheets/components/_exchange.scss # app/components/Account/AccountAssetUpdate.jsx # app/components/Exchange/Exchange.jsx # app/components/Exchange/ExchangeHeader.jsx Signed-off-by: Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
bitshares · Sep 19, 2018 · 5ac82a2 · 5ac82a2
2 parents 9eedce3 + 20aee1b
commit 5ac82a2
Show file tree

Hide file tree

Showing 45 changed files with 5,236 additions and 234 deletions.
diff --git a/README.md b/README.md
@@ -88,22 +88,21 @@ Clone this repository, run `docker-compose up` and visit localhost:8080
 
 
 ## Contributing
-Please work off the staging branch and make pull requests to that branch. The master branch will only be updated for new releases.
+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](http://www.bitshares.foundation/workers/2018-02-bitshares-ui). It provides the funds needed to pay the coordinator and the bounties and the Bitshares Foundation.
+The Bitshares UI team is supported by this [worker](https://www.bitshares.foundation/workers/2018-08-bitshares-ui). It provides the funds needed to pay the coordinator and the bounties and the Bitshares Foundation.
 
 If you would like to get involved, we have a [Telegram chatroom](https://t.me/BitSharesDEX) where you can ask questions and get help. You may also join [BitShares on Discord](https://discord.gg/GsjQfAJ)
 
-- Coordinator: Bill Butler, @billbutler
+- Project Manager: Magnus Anderson, @startail
+- Issue and Funds Coordinator: Bill Butler, @billbutler
 - Lead Developer: Sigve Kvalsvik, @sigvek
-- Developer: Calvin Froedge, @calvin
-- Code Review: Fabian Schuh, @xeroc
 
 ## Development process
 
 - New issues will, after enough discussion and clarification, be assigned an estimate time to complete, as well as assigned to the next unstarted milestone, by a project coordinator.
 - Milestones are numbered YYMMDD and refer to the **anticipated release date of the next Release Candidate**.
-- Release Candidates sits 1 milestone period (2 weeks) for evaluation by the public before release
+- Release Candidates sits 1-2 weeks for evaluation by the public before release
 - 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.

diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js
@@ -45,6 +45,16 @@ export const widechainAPIs = {
     DEPOSIT_HISTORY: "/latelyRecharge"
 };
 
+export const citadelAPIs = {
+    BASE: "https://citadel.li/trade",
+    COINS_LIST: "/coins",
+    ACTIVE_WALLETS: "/active-wallets",
+    TRADING_PAIRS: "/trading-pairs",
+    DEPOSIT_LIMIT: "/deposit-limits",
+    ESTIMATE_OUTPUT: "/estimate-output-amount",
+    ESTIMATE_INPUT: "/estimate-input-amount"
+};
+
 export const gdex2APIs = {
     BASE: "https://api.gdex.io/adjust",
     COINS_LIST: "/coins",
@@ -137,12 +147,6 @@ export const settingsAPIs = {
             operator: "Witness: openledger-dc",
             contact: "telegram:mtopenledger"
         },
-        {
-            url: "wss://bitshares.nu/ws",
-            location: "Stockholm",
-            region: "Northern Europe",
-            country: "Sweden"
-        },
         {
             url: "wss://bit.btsabc.org/ws",
             region: "Eastern Asia",
@@ -161,9 +165,138 @@ export const settingsAPIs = {
         },
         {
             url: "wss://japan.bitshares.apasia.tech/ws",
+            location: "Tokyo",
             country: "Japan",
             region: "Southeastern Asia",
-            operator: "APAsia",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://status200.bitshares.apasia.tech/ws",
+            location: "New Jersey",
+            country: "U.S.A.",
+            region: "Central 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",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://dallas.bitshares.apasia.tech/ws",
+            location: "Dallas",
+            country: "U.S.A.",
+            region: "Central 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",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://atlanta.bitshares.apasia.tech/ws",
+            location: "Atlanta",
+            country: "U.S.A.",
+            region: "Central 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",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://seattle.bitshares.apasia.tech/ws",
+            location: "Seattle",
+            country: "U.S.A.",
+            region: "Central 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",
+            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",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://canada6.daostreet.com",
+            location: "Toronto",
+            country: "Canada",
+            region: "Northern America",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://bitshares.nu/ws",
+            location: "Stockholm",
+            region: "Northern Europe",
+            country: "Sweden",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:StaflunD"
+        },
+        {
+            url: "wss://api.open-asset.tech/ws",
+            location: "Frankfurt",
+            region: "Western Europe",
+            country: "Germany",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:StaflunD"
+        },
+        {
+            url: "wss://france.bitshares.apasia.tech/ws",
+            location: "Paris",
+            country: "France",
+            region: "Western Europe",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://england.bitshares.apasia.tech/ws",
+            location: "London",
+            country: "England",
+            region: "Northern Europe",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://netherlands.bitshares.apasia.tech/ws",
+            location: "Amsterdam",
+            country: "Netherlands",
+            region: "Northern Europe",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://australia.bitshares.apasia.tech/ws",
+            location: "Sidney",
+            country: "Australia",
+            region: "Australia",
+            operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
@@ -466,7 +599,15 @@ export const settingsAPIs = {
             region: "TESTNET - Northern America",
             country: "U.S.A.",
             location: "Dallas",
-            operator: "APAsia",
+            operator: "Flash Infrastructure Worker",
+            contact: "telegram:murda_ra"
+        },
+        {
+            url: "wss://testnet-eu.bitshares.apasia.tech/ws",
+            region: "TESTNET - Northern Europe",
+            country: "Netherlands",
+            location: "Amsterdam",
+            operator: "Flash Infrastructure Worker",
             contact: "telegram:murda_ra"
         },
         {
@@ -476,6 +617,14 @@ export const settingsAPIs = {
             location: "Paris",
             operator: "Witness: zapata42-witness",
             contact: "telegram:Zapata_42"
+        },
+        {
+            url: "wss://citadel.li/node",
+            region: "Western Europe",
+            country: "Iceland",
+            location: "Reykjavik",
+            operator: "CITADEL",
+            contact: "email:citadel.li;support"
         }
     ],
     DEFAULT_FAUCET: getFaucet().url,

diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json
@@ -799,6 +799,13 @@
         "calc": "Calculating",
         "choose_deposit": "Please select the coin you would like to deposit",
         "choose_withdraw": "Please select the coin you would like to withdraw",
+        "citadel": {
+            "coming_soon": "Coming soon",
+            "min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
+            "min_amount_error": "Please enter number >= minimum",
+            "support_block": "For support, please contact citadel.li at:",
+            "under_construction": "Under Construction"
+        },
         "contact_TRADE": "Contact Blocktrades",
         "convert": "Internal conversion",
         "convert_coin": "Convert to %(coin)s (%(symbol)s)",

diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -253,7 +253,9 @@
             "force_settlement_offset_percent": "Percent offset of forced settlements",
             "global_settle": "Allow issuer to force a global settling",
             "id": "ID",
+            "invalid_backing_asset_change": "You can't change the backing asset of an asset that has a non-zero current supply",
             "invalid_market_pair": "Preferred market pairing can not be the same market",
+            "invalid_permissions_change": "You can't enable a permission for an asset that has a non-zero current supply",
             "issued_assets": "Issued Assets",
             "market": "Preferred market pairing",
             "market_fee": "Market fee",
@@ -390,6 +392,10 @@
         "understand": "I understand",
         "ws_status": "Full node connection status"
     },
+    "boolean": {
+        "true": "True",
+        "false": "False"
+    },
     "borrow": {
         "adjust": "Update position",
         "adjust_short": "Adjust",
@@ -461,6 +467,7 @@
         "chart_height": "Chart height (pixels)",
         "chart_modal": "Chart options",
         "chart_type": "Chart type",
+        "checking_for_worth_less_settlement": "Checking if you can get a better price by selling to market, please wait..",
         "confirm_buy": "Your order is %(diff)s times higher than the lowest ask, are you sure?",
         "confirm_no_orders_buy": "You are placing a buy order in a market with no open sell orders. Are you certain you wish to proceed?",
         "confirm_no_orders_sell": "You are placing a sell order in a market with no open buy orders. Are you certain you wish to proceed?",
@@ -553,6 +560,7 @@
         "vol_short": "Vol",
         "volume": "Volume",
         "volume_24": "24hr Volume",
+        "worth_less_settlement_warning": "Warning! You can get a better price by selling to {market_link}.",
         "your_price": "Your Call Price",
         "zoom": "Zoom",
         "zoom_all": "All"
@@ -801,6 +809,13 @@
         "calc": "Calculating",
         "choose_deposit": "Please select the coin you would like to deposit",
         "choose_withdraw": "Please select the coin you would like to withdraw",
+        "citadel": {
+            "coming_soon": "Coming soon",
+            "min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
+            "min_amount_error": "Please enter number >= minimum",
+            "support_block": "For support, please contact citadel.li at:",
+            "under_construction": "Under Construction"
+        },
         "contact_TRADE": "Contact Blocktrades",
         "convert": "Internal conversion",
         "convert_coin": "Convert to %(coin)s (%(symbol)s)",
@@ -884,6 +899,7 @@
         "unavailable_OPEN": "The OpenLedger Gateway is down or not responding",
         "unavailable_RUDEX": "The RuDEX Gateway is down or not responding",
         "unavailable_TRADE": "The Blocktrades Bridge is down or not responding",
+        "unavailable_CITADEL": "The Citadel Bridge is down or not responding",
         "unavailable_bridge": "The bridge service for this asset is currently down, please try again later",
         "use_copy_button": "PLEASE USE COPY BUTTON TO MAKE COPY OF ADDRESS OR MEMO ON THIS PAGE",
         "user_unavailable": "User informaction is current unavailable, please try again later",
@@ -1127,6 +1143,11 @@
         },
         "ok": "OK",
         "proposals": {
+            "actions": {
+                "approve": "Approve proposal",
+                "reject": "Reject proposal",
+                "delete": "Permanently reject proposal"
+            },
             "approval_add": "Approval to add",
             "approval_remove": "Approval to remove",
             "key_approval_add": "Key approval to add",
@@ -1222,9 +1243,9 @@
         "no_recent": "No recent transactions",
         "override_transfer": "{issuer} transferred {amount} from {from} to {to}",
         "pending": "pending %(blocks)s blocks",
-        "proposal_create": "{account} created a proposed transaction",
-        "proposal_delete": "{account} deleted a proposed transaction",
-        "proposal_update": "{account} updated a proposed transaction",
+        "proposal_create": "{account} created the proposed transaction {proposal}",
+        "proposal_delete": "{account} deleted the proposed transaction {proposal}",
+        "proposal_update": "{account} updated the proposed transaction {proposal}",
         "publish_feed": "{account} published feed price of {price}",
         "reg_account": "{registrar} registered the account {new_account}",
         "set_proxy": "{account} set {proxy} as their voting proxy",
@@ -1262,6 +1283,7 @@
         "asset_update": "Update the asset {asset} using the account {account}",
         "call_order_update": "Change {account} {debtSymbol} debt by {debt} and collateral by {collateral}",
         "committee_member_update_global_parameters": "Update committee global parameters by {account}",
+        "delete": "Permanently reject",
         "expires": "Expires",
         "feed_producer": "Update the feed producers for the asset {asset} using the account {account}",
         "limit_order_buy": "Place an order to buy {amount} at {price} for {account}",
@@ -1280,6 +1302,14 @@
             "owner_approvals_to_add": "Owner approvals to add",
             "owner_approvals_to_remove": "Owner approvals to remove"
         },
+        "updated": {
+            "active_approvals_to_add": "Active approval(s) added",
+            "active_approvals_to_remove": "Active approval(s) removed",
+            "key_approvals_to_add": "Key approval(s) added",
+            "key_approvals_to_remove": "Key approval(s) removed",
+            "owner_approvals_to_add": "Owner approval(s) added",
+            "owner_approvals_to_remove": "Owner approval(s) removed"
+        },
         "update_account": "Update account data for {account}",
         "vesting_balance_withdraw": "Withdraw {amount} from vesting balance of {account}"
     },
@@ -1290,6 +1320,9 @@
         "proposed_operations": "Proposed operations",
         "review_period": "Review period begin"
     },
+    "proposal_delete": {
+        "using_owner_authority": "Using owner authority"
+    },
     "propose": "Propose",
     "qr_address_scanner": {
         "address_found": "Address found",

diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json
@@ -799,6 +799,13 @@
         "calc": "Calculando",
         "choose_deposit": "Seleccione la moneda que desea depositar",
         "choose_withdraw": "Seleccione la moneda que desea retirar",
+        "citadel": {
+            "coming_soon": "Coming soon",
+            "min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
+            "min_amount_error": "Please enter number >= minimum",
+            "support_block": "For support, please contact citadel.li at:",
+            "under_construction": "Under Construction"
+        },
         "contact_TRADE": "Contacta Blocktrades",
         "convert": "Conversión interna",
         "convert_coin": "Convertir a %(coin)s (%(symbol)s)",

diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json
@@ -799,6 +799,13 @@
         "calc": "Calculating",
         "choose_deposit": "Please select the coin you would like to deposit",
         "choose_withdraw": "Please select the coin you would like to withdraw",
+        "citadel": {
+            "coming_soon": "Coming soon",
+            "min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
+            "min_amount_error": "Please enter number >= minimum",
+            "support_block": "For support, please contact citadel.li at:",
+            "under_construction": "Under Construction"
+        },
         "contact_TRADE": "Contact Blocktrades",
         "convert": "Internal conversion",
         "convert_coin": "Convert to %(coin)s (%(symbol)s)",