+ add Warning for Potencial scam trading pairs

+ add Notify for copied (address and memo) in Deposits + not cache "unknown" address + Get donate - wrapper all link + GDEX gate delete
blckchnd · Apr 29, 2020 · 4735976 · 4735976
1 parent b6c7b86
commit 4735976
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 133 deletions.
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -36,6 +36,10 @@
             "not_yours": "Not your account",
             "unknown": "Unknown account"
         },
+        "notify": {
+            "copy_memo": "Memo copied",
+            "copy_address": "Address copied"
+        },
         "estimate_value": "Estimated Account value",
         "existing_accounts": "Existing Accounts",
         "existing_user": "Existing user",
@@ -810,6 +814,12 @@
         "vol_short": "Vol",
         "volume": "Volume",
         "volume_24": "24hr Volume",
+        "scam_alert": {
+            "text1": "WARNING: ",
+            "text2": "Potentially dangerous trading pair! Assets on this market are ",
+            "text3": "UNrelated ",
+            "text4": "to RuDEX – by trading on this market you claim responsibility for potential losses of your funds"
+        },
         "worth_less_settlement_warning": "The current market price of {market_link} is higher than settle price",
         "your_price": "Your Call Price",
         "zoom": "Zoom",

diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
@@ -36,6 +36,10 @@
             "not_yours": "Не ваш аккаунт",
             "unknown": "Неизвестный аккаунт"
         },
+        "notify": {
+            "copy_memo": "Мемо скопировано",
+            "copy_address": "Адрес скопирован"
+        },
         "estimate_value": "Ориентировочная стоимость аккаунта",
         "existing_accounts": "Существующие аккаунты",
         "existing_user": "Существующий пользователь",
@@ -810,6 +814,12 @@
         "vol_short": "Объем",
         "volume": "Объем",
         "volume_24": "Суточный объем",
+        "scam_alert": {
+            "text1": "ВНИМАНИЕ: ",
+            "text2": "Потенциально опасная торговая пара! Активы, представленные на данном рынке ",
+            "text3": "НЕ имеют ",
+            "text4": "отношения к RuDEX. Осуществляя торговлю на этом рынке вы принимаете ответственность за потенциальные риски потери ваших средств."
+        },
         "worth_less_settlement_warning": "Текущая рыночная цена на {market_link} выше, чем расчётная цена",
         "your_price": "Ваша цена досрочного погашения",
         "zoom": "Приблизить",

diff --git a/app/assets/stylesheets/themes/_theme-template.scss b/app/assets/stylesheets/themes/_theme-template.scss
@@ -266,8 +266,8 @@
     }
     .settings-input {
         /* !important to overwrite styles for Inputs on User Settings. By default inputs take styles from
-    .block-list and it uses on many places. To keep everything OK and do not break something I just do
-    overwrite for Inputs on settings and keep default styles for inputs on another places. */
+.block-list and it uses on many places. To keep everything OK and do not break something I just do
+overwrite for Inputs on settings and keep default styles for inputs on another places. */
         color: $settings-select-color !important;
         height: 36px !important;
         background-color: $settings-select-bg !important;
@@ -2677,33 +2677,40 @@
         }
     }
 }
+
 .rc-time-picker-panel {
     z-index: 9999 !important;
 }
+
 .midnightTheme .gate_fee .amount-selector {
     width: 100%;
     display: inline-block;
 }
+
 .midnightTheme .gate_fee .right-selector {
     text-align: right;
     width: 26%;
     display: inline-block;
     color: #adadad;
     text-transform: uppercase;
 }
+
 .midnightTheme .gate_fee .right-selector .right-selector-input {
     text-align: right;
     width: 100%;
 }
+
 .clear-text,
 .search-wrapper {
     position: relative;
 }
+
 .market-filter-input,
 .clear-text,
 .search-wrapper {
     position: relative;
 }
+
 .clear-text {
     top: 10px;
     right: -30px;
@@ -2714,6 +2721,7 @@
     outline: 0;
     cursor: pointer;
 }
+
 .clear-text:after {
     content: "X";
     display: block;
@@ -2734,9 +2742,11 @@
     font-size: 12px;
     cursor: pointer;
 }
+
 .market-filter-input:not(:valid) ~ .clear-text {
     display: none;
 }
+
 .header-container {
     display: flex;
     align-items: center;
@@ -2775,6 +2785,7 @@
         line-height: normal;
     }
 }
+
 .local-wallet-menu {
     // top: 50px!important;
     .table-cell {
@@ -2787,6 +2798,7 @@
         }
     }
 }
+
 .app-menu {
     flex: 0;
 }
@@ -2807,6 +2819,7 @@
         text-align: right;
     }
 }
+
 #qr_scanner_modal {
     > section {
         width: 100%;
@@ -2816,6 +2829,7 @@
         justify-content: center;
     }
 }
+
 @media screen and (max-width: 640px) {
     .responsive-list > .help-content > ul {
         height: 300px;
@@ -2833,6 +2847,7 @@
         }
     }
 }
+
 div.customizable-column--selector {
     position: absolute;
     right: 1rem;
@@ -2844,11 +2859,24 @@ div.customizable-column--selector {
         }
     }
 }
+
 div.customizable-column--selector--dropdown {
     ul.ant-select-dropdown-menu-vertical {
         max-height: 100% !important;
     }
 }
+
 .ant-table-tbody > tr.ant-table-row-selected td {
     background-color: #4f596633 !important;
 }
+
+.potencial_scam_markets {
+    margin: 0 10% 15px 0;
+    width: 90%;
+    font-weight: bold;
+    font-size: 20px;
+    line-height: 1.25em;
+    text-align: center;
+    border: 1px solid red;
+    padding: 5px;
+}
diff --git a/app/branding.js b/app/branding.js
@@ -215,7 +215,6 @@ export function getFeaturedMarkets(quotes = []) {
         ["BTS", "RUDEX.WLS"],
         ["BTS", "RUDEX.SMOKE"],
         ["BTS", "RUDEX.PZM"]
-        //["BTS", "DONATE"]
     ].filter(a => {
         if (!quotes.length) return true;
         return quotes.indexOf(a[0]) !== -1;
@@ -257,7 +256,7 @@ export function getAssetHideNamespaces() {
  * @returns {boolean}
  */
 export function allowedGateway(gateway) {
-    const allowedGateways = ["RUDEX", "GDEX"];
+    const allowedGateways = ["RUDEX"];
     if (!gateway) {
         // answers the question: are any allowed?
         return allowedGateways.length > 0;

diff --git a/app/components/Account/AccountDepositWithdraw.jsx b/app/components/Account/AccountDepositWithdraw.jsx
@@ -15,13 +15,10 @@ import HelpContent from "../Utility/HelpContent";
 import AccountStore from "stores/AccountStore";
 import SettingsStore from "stores/SettingsStore";
 import SettingsActions from "actions/SettingsActions";
-//import {openledgerAPIs} from "api/apiConfig";
 import RuDexGateway from "../DepositWithdraw/rudex/RuDexGateway";
 import GatewayStore from "stores/GatewayStore";
 import AccountImage from "../Account/AccountImage";
-//import BitsparkGateway from "../DepositWithdraw/bitspark/BitsparkGateway";
-import GdexGateway from "../DepositWithdraw/gdex/GdexGateway";
-//import XbtsxGateway from "../DepositWithdraw/xbtsx/XbtsxGateway";
+
 import PropTypes from "prop-types";
 import DepositModal from "../Modal/DepositModal";
 import WithdrawModal from "../Modal/WithdrawModalNew";
@@ -176,24 +173,11 @@ class AccountDepositWithdraw extends React.Component {
         });
     }
 
-    renderServices(
-        openLedgerGatewayCoins,
-        rudexGatewayCoins,
-        bitsparkGatewayCoins,
-        xbtsxGatewayCoins
-    ) {
+    renderServices(rudexGatewayCoins) {
         //let services = ["Openledger (OPEN.X)", "BlockTrades (TRADE.X)", "Transwiser", "BitKapital"];
         let serList = [];
         let {account} = this.props;
-        let {
-            olService,
-            btService,
-            rudexService,
-            bitsparkService,
-            xbtsxService,
-            citadelService,
-            RudexNotice1Informed
-        } = this.state;
+        let {rudexService, RudexNotice1Informed} = this.state;
 
         let agreement_ru =
             "https://rudex.freshdesk.com/support/solutions/articles/35000138247-cоглашение-об-оказании-услуг-шлюза";
@@ -287,73 +271,13 @@ class AccountDepositWithdraw extends React.Component {
             )
         });
 
-        serList.push({
-            name: "GDEX",
-            identifier: "GDEX",
-            template: (
-                <div>
-                    <GdexGateway account={account} provider={"gdex"} />
-                </div>
-            )
-        });
-
-        /*        serList.push({
-            name: "BitSpark (SPARKDEX.X)",
-            identifier: "SPARKDEX",
-            template: (
-                <div className="content-block">
-                    <div
-                        className="service-selector"
-                        style={{marginBottom: "2rem"}}
-                    >
-                        <ul className="button-group segmented no-margin">
-                            <li
-                                onClick={this.toggleBitSparkService.bind(
-                                    this,
-                                    "gateway"
-                                )}
-                                className={
-                                    bitsparkService === "gateway"
-                                        ? "is-active"
-                                        : ""
-                                }
-                            >
-                                <a>
-                                    <Translate content="gateway.gateway" />
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-
-                    {bitsparkService === "gateway" &&
-                    bitsparkGatewayCoins.length ? (
-                            <BitsparkGateway
-                                account={account}
-                                coins={bitsparkGatewayCoins}
-                                provider="bitspark"
-                            />
-                        ) : null}
-                </div>
-            )
-        });*/
-
         return serList;
     }
 
     render() {
         let {account, servicesDown} = this.props;
         let {activeService} = this.state;
 
-        let openLedgerGatewayCoins = this.props.openLedgerBackedCoins
-            .map(coin => {
-                return coin;
-            })
-            .sort((a, b) => {
-                if (a.symbol < b.symbol) return -1;
-                if (a.symbol > b.symbol) return 1;
-                return 0;
-            });
-
         let rudexGatewayCoins = this.props.rudexBackedCoins
             .map(coin => {
                 return coin;
@@ -364,32 +288,7 @@ class AccountDepositWithdraw extends React.Component {
                 return 0;
             });
 
-        let bitsparkGatewayCoins = this.props.bitsparkBackedCoins
-            .map(coin => {
-                return coin;
-            })
-            .sort((a, b) => {
-                if (a.symbol < b.symbol) return -1;
-                if (a.symbol > b.symbol) return 1;
-                return 0;
-            });
-
-        let xbtsxGatewayCoins = this.props.xbtsxBackedCoins
-            .map(coin => {
-                return coin;
-            })
-            .sort((a, b) => {
-                if (a.symbol < b.symbol) return -1;
-                if (a.symbol > b.symbol) return 1;
-                return 0;
-            });
-
-        let services = this.renderServices(
-            openLedgerGatewayCoins,
-            rudexGatewayCoins,
-            bitsparkGatewayCoins,
-            xbtsxGatewayCoins
-        );
+        let services = this.renderServices(rudexGatewayCoins);
 
         const serviceNames = [];
         let options = services.map((services_obj, index) => {