Merge branch 'development' into feat/313-pre-order-banner

.env.local

@@ -10,7 +10,7 @@ REACT_APP_TEST_FIRST_BLOCK=0
 REACT_APP_PORTIS_ID=469a25c8-1101-4c57-823d-c47cb328f788
 
 REACT_APP_WHITELIST=false
-REACT_APP_WHITELIST_TOKEN=
+REACT_APP_WHITELIST_TOKEN=0xC5452Dbb2E3956C1161cB9C2d6DB53C2b60E7805
 
 REACT_APP_YBUG_ID=
 

.env.production

@@ -5,12 +5,12 @@ REACT_APP_SENTRY_DSN=https://[email protected]
 
 REACT_APP_PORTIS_ID=469a25c8-1101-4c57-823d-c47cb328f788
 
-REACT_APP_WHITELIST=false
-REACT_APP_WHITELIST_TOKEN=0x576aE218aeCfD4CbD2DBe07250b47e26060932B1
+REACT_APP_WHITELIST=true
+REACT_APP_WHITELIST_TOKEN=0x857a62c9c0b6f1211e04275a1f0c5f26fce2021f
 
 REACT_APP_YBUG_ID=3f1jrxvzrhkn1b975t8b
 
 
 REACT_APP_MAILCHIMP=https://gmail.us17.list-manage.com/subscribe/post?u=e66850f0b51ebbdbe1f2c3e36&id=ef5d452839
 
-REACT_APP_DISABLE_NEW_TRADES=true
+REACT_APP_DISABLE_NEW_TRADES=false

.env.testnet

@@ -9,6 +9,6 @@ REACT_APP_YBUG_ID=3f1jrxvzrhkn1b975t8b
 REACT_APP_MAILCHIMP=https://gmail.us17.list-manage.com/subscribe/post?u=e66850f0b51ebbdbe1f2c3e36&id=ef5d452839
 
 REACT_APP_WHITELIST=false
-REACT_APP_WHITELIST_TOKEN=
+REACT_APP_WHITELIST_TOKEN=0xC5452Dbb2E3956C1161cB9C2d6DB53C2b60E7805
 
 REACT_APP_DISABLE_NEW_TRADES=false

src/app/components/CurrentPositionProfit/index.tsx

@@ -4,6 +4,8 @@
  *
  */
 import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { translations } from 'locales/i18n';
 import { Asset } from 'types/asset';
 import { toNumberFormat, weiToNumberFormat } from 'utils/display-text/format';
 import { useCurrentPositionPrice } from 'app/hooks/trading/useCurrentPositionPrice';
@@ -19,6 +21,7 @@ interface Props {
 }
 
 export function CurrentPositionProfit(props: Props) {
+  const { t } = useTranslation();
   const { loading, price } = useCurrentPositionPrice(
     props.destination,
     props.source,
@@ -41,23 +44,25 @@ export function CurrentPositionProfit(props: Props) {
     if (diff > 0) {
       return (
         <>
-          Up by{' '}
+          {t(translations.tradingHistoryPage.table.profitLabels.up)}
           <span className="text-green">{toNumberFormat(diff * 100, 2)}</span>%
         </>
       );
     }
     if (diff < 0) {
       return (
         <>
-          Down by{' '}
+          {t(translations.tradingHistoryPage.table.profitLabels.down)}
           <span className="text-red">
             {toNumberFormat(Math.abs(diff * 100), 2)}
           </span>
           %
         </>
       );
     }
-    return <>No change</>;
+    return (
+      <>{t(translations.tradingHistoryPage.table.profitLabels.noChange)}</>
+    );
   }
   return (
     <>

src/app/components/NotificationForm/NotificationFormComponent/index.tsx

@@ -26,7 +26,7 @@ export function NotificationFormComponent(props: Props) {
   const s = translations.notificationFormContainer;
   const text = {
     signup: {
-      buttonText: 'submit',
+      buttonText: t(s.dialog.wantBtn),
       title: (
         <p className="font-family-work-sans">
           <span className="mr-2">
@@ -37,7 +37,7 @@ export function NotificationFormComponent(props: Props) {
       ),
     },
     update: {
-      buttonText: 'update',
+      buttonText: t(s.dialog.updateBtn),
       title: <p>{t(s.update)}</p>,
     },
   };
@@ -85,7 +85,7 @@ export function NotificationFormComponent(props: Props) {
             className="col-md-8 col-sm-12"
             style={{ fontSize: '11px' }}
           >
-            {t(s.recieve)}
+            {t(s.receive)}
           </Checkbox>
         )}
         <div

src/app/components/SendTxProgress/index.tsx

@@ -47,6 +47,7 @@ export function SendTxProgress(props: Props) {
 
   useEffect(() => {
     props.status === TxStatus.PENDING_FOR_USER && setDisplay(true);
+    props.status === TxStatus.NONE && setDisplay(false);
   }, [props.status]);
 
   useEffect(() => {

src/app/containers/MarginTradeForm/TradeConfirmationDialog.module.css

@@ -44,6 +44,7 @@
     font-weight: 400;
     line-height: 20px;
     margin-bottom: 25px;
+    text-align: center;
 }
 
 .button {
@@ -53,14 +54,15 @@
     margin: 0 auto;
     text-transform: uppercase;
     color: #ffffff;
-    border: 0;
     border-radius: 10px;
     font-size: 23px;
     font-weight: 700;
     line-height: 23px;
     letter-spacing: 0;
     padding: 15px;
     transition: opacity 0.3s;
+    background: transparent;
+    border: 1px solid #ffffff;
 }
 .button:hover {
     opacity: 0.9;
@@ -72,9 +74,11 @@
 
 .button_long {
     background-color: #4ECDC4;
+    border: 0;
 }
 .button_short {
     background-color: #cd4e4e;
+    border: 0;
 }
 
 .container {
@@ -113,3 +117,4 @@
     margin-bottom: 15px;
     text-align: center;
 }
+.txHash {}