sync up

piratecash · Jul 12, 2019 · a91e441 · a91e441
1 parent 8e79ef0
commit a91e441
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 21 deletions.
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -804,8 +804,7 @@
                 "max_supply": "Max supply",
                 "title": "Permissions",
                 "whitelist_authorities": "Whitelist authorities",
-                "whitelist_markets": "Whitelist markets",
-                "accounts_in_whitelist_market_fee_sharing": "Accounts included in Market fee sharing whitelist"
+                "whitelist_markets": "Whitelist markets"
             },
             "prediction_market_asset": {
                 "prediction": "Prediction",
@@ -1801,8 +1800,8 @@
         "confirm_remove": "Are you sure you want to remove %(name)s from your available nodes?",
         "confirm_yes": "Always",
         "connection_error": "Unable to connect to API node %(url)s, falling back to known working nodes. Error was: %(error)s",
-        "custom": "Custom",
         "current_fee_asset": "Current fee asset is: ",
+        "custom": "Custom",
         "darkTheme": "Dark",
         "delete_select": "Select local wallet to delete",
         "disabled": "Disabled",

diff --git a/app/components/Blockchain/Asset.jsx b/app/components/Blockchain/Asset.jsx
@@ -1427,12 +1427,6 @@ class Asset extends React.Component {
                 return new Date(feed2[1][0]) - new Date(feed1[1][0]);
             });
 
-        var feed_price_header =
-            feeds.length > 0
-                ? assetUtils.extractRawFeedPrice(feeds[0][1][1])
-                : NaN;
-        var core_exchange_rate_header =
-            feeds.length > 0 ? feeds[0][1][1].core_exchange_rate : NaN;
         let dataSource = [];
         let columns = [];
 

diff --git a/app/components/Blockchain/Transaction.jsx b/app/components/Blockchain/Transaction.jsx
@@ -22,18 +22,6 @@ import ReactTooltip from "react-tooltip";
 import moment from "moment";
 import {Link, DirectLink} from "react-scroll";
 import {Tooltip} from "bitshares-ui-style-guide";
-import SetDefaultFeeAssetModal from "../Modal/SetDefaultFeeAssetModal";
-import {
-    Link,
-    DirectLink,
-    Element,
-    Events,
-    animateScroll as scroll,
-    scrollSpy,
-    scroller
-} from "react-scroll";
-import {Tooltip, Button} from "bitshares-ui-style-guide";
-import {Tooltip} from "bitshares-ui-style-guide";
 import asset_utils from "../../lib/common/asset_utils";
 import sanitize from "sanitize";