Fix wallet name in transactions history

public/assets/locales/en/translation.json

@@ -81,7 +81,7 @@
     "BUSD": "BUSD",
     "DOGE": "DOGE",
     "LTC": "LTC",
-    "TBNB": "TBUSD",
+    "TBNB": "TBNB",
     "TBUSD": "TBUSD",
     "BCH": "BCH",
     "TRX": "TRX"
@@ -255,6 +255,16 @@
     "category": "Categories",
     "size": "Number",
     "period" : "Period",
+    "assetBlock" : "Reservation",
+    "assetUnBlocked" : "Asset UnBlocked",
+    "refund" : "Refund",
+    "startRefund" : "Start Refund",
+    "cancelExchange" : "Canceled",
+    "readyToExchange" : "Awaiting",
+    "decreaseWallet" : "Deduction",
+    "increaseWallet" : "Addition",
+    "balanceStatus" : "Balance Status",
+    "selfTrade" : "Self Trade",
     "ascendingByTime" : "Ascending By Time"
   },
   "TransactionCategory": {
@@ -264,7 +274,7 @@
     "WITHDRAW": "Withdraw",
     "ORDER_CANCEL": "Cancel Order",
     "ORDER_CREATE": "Create Order",
-    "ORDER_FINALIZED": "Finalized Order",
+    "ORDER_FINALIZED": "Refund",
     "ETC" : "Unknown"
   },
   "DepositWithdraw": {

public/assets/locales/fa/translation.json

@@ -255,6 +255,16 @@
     "category" : "نوع تراکنش",
     "size" : "تعداد",
     "period" : "بازه زمانی",
+    "assetBlock" : "رزرو",
+    "assetUnBlocked" : "رفع مسدودی",
+    "refund" : "بازگشت پول",
+    "startRefund" : "شروع بازگردانی",
+    "cancelExchange" : "لغو شده",
+    "readyToExchange" : "آماده مبادله",
+    "decreaseWallet" : "کاهش",
+    "increaseWallet" : "افزایش",
+    "balanceStatus" : "وضعیت موجودی",
+    "selfTrade" : "جیب به جیب",
     "ascendingByTime" : "نمایش براساس جدیدترین"
   },
   "TransactionCategory": {
@@ -264,7 +274,7 @@
     "WITHDRAW" : "برداشت",
     "ORDER_CANCEL" : "لغو سفارش",
     "ORDER_CREATE" : "ثبت سفارش",
-    "ORDER_FINALIZED" : "اتمام سفارش",
+    "ORDER_FINALIZED" : "بازگشت وجه",
     "ETC" : "نامشخص"
   },
   "DepositWithdraw": {

public/assets/locales/uzb/translation.json

@@ -81,7 +81,7 @@
     "BUSD": "BUSD",
     "DOGE": "DOGE",
     "LTC": "LTC",
-    "TBNB": "TBUSD",
+    "TBNB": "TBNB",
     "TBUSD": "TBUSD",
     "BCH": "BCH",
     "TRX": "TRX"
@@ -255,6 +255,16 @@
     "category": "Toifalar",
     "size": "Raqam",
     "period" : "Davr",
+    "assetBlock" : "Rezervasyon",
+    "assetUnBlocked" : "Blokdan chiqarish",
+    "refund" : "Qaytarish",
+    "startRefund" : "Qaytarishni boshlash",
+    "cancelExchange" : "Bekor qilindi",
+    "readyToExchange" : "Almashtirishga tayyor",
+    "decreaseWallet" : "Inventarizatsiyani qisqartirish",
+    "increaseWallet" : "Inventarning ko'payishi",
+    "balanceStatus" : "Muvozanat holati",
+    "selfTrade" : "O'z-o'zidan savdo",
     "ascendingByTime" : "Eng so'nggisiga asoslangan ko'rsatish"
   },
   "TransactionCategory": {
@@ -264,7 +274,7 @@
     "WITHDRAW": "Olib chiqish",
     "ORDER_CANCEL": "Buyurtmani bekor qilish",
     "ORDER_CREATE": "Buyurtma yaratish",
-    "ORDER_FINALIZED": "Buyurtma yakunlandi",
+    "ORDER_FINALIZED": "Qaytarish",
     "ETC" : "Noma'lum"
   },
   "DepositWithdraw": {

src/assets/fontIcon/opex-icon/config.json

@@ -1082,6 +1082,30 @@
         "exchange-arrow"
       ]
     },
+    {
+      "uid": "3838a5aba604532d2dbae5904615ea39",
+      "css": "down",
+      "code": 546,
+      "src": "mfglabs"
+    },
+    {
+      "uid": "c21d309f797d3644dc8d28c4617738ce",
+      "css": "left",
+      "code": 547,
+      "src": "mfglabs"
+    },
+    {
+      "uid": "1d35198f5190ec004dd4ec742fbe19ca",
+      "css": "right",
+      "code": 548,
+      "src": "mfglabs"
+    },
+    {
+      "uid": "040e72500c863813088c9f9c9415f8e9",
+      "css": "up",
+      "code": 549,
+      "src": "mfglabs"
+    },
     {
       "uid": "7e2d15c7214058b9c51c23ac2ae37f7e",
       "css": "icons8_more_info",

src/assets/fontIcon/opex-icon/css/opex-icon-codes.css

@@ -87,6 +87,10 @@
 .icon-username-icon:before { content: '\0219'; } /* 'ș' */
 .icon-user-key-icon:before { content: '\0220'; } /* 'Ƞ' */
 .icon-exchange-arrow:before { content: '\0221'; } /* 'ȡ' */
+.icon-down:before { content: '\0222'; } /* 'Ȣ' */
+.icon-left:before { content: '\0223'; } /* 'ȣ' */
+.icon-right:before { content: '\0224'; } /* 'Ȥ' */
+.icon-up:before { content: '\0225'; } /* 'ȥ' */
 .icon-market:before { content: '\e800'; } /* '' */
 .icon-cancel-circled2:before { content: '\e801'; } /* '' */
 .icon-settings:before { content: '\e802'; } /* '' */

src/assets/fontIcon/opex-icon/css/opex-icon-ie7-codes.css

@@ -87,6 +87,10 @@
 .icon-username-icon { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ș '); }
 .icon-user-key-icon { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ƞ '); }
 .icon-exchange-arrow { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȡ '); }
+.icon-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȣ '); }
+.icon-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȣ '); }
+.icon-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȥ '); }
+.icon-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȥ '); }
 .icon-market { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-settings { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

src/assets/fontIcon/opex-icon/css/opex-icon-ie7.css

@@ -98,6 +98,10 @@
 .icon-username-icon { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ș '); }
 .icon-user-key-icon { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ƞ '); }
 .icon-exchange-arrow { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȡ '); }
+.icon-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȣ '); }
+.icon-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȣ '); }
+.icon-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȥ '); }
+.icon-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȥ '); }
 .icon-market { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-settings { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

src/assets/fontIcon/opex-icon/css/opex-icon.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'opex-icon';
-  src: url('../font/opex-icon.eot?68588012');
-  src: url('../font/opex-icon.eot?68588012#iefix') format('embedded-opentype'),
-       url('../font/opex-icon.woff2?68588012') format('woff2'),
-       url('../font/opex-icon.woff?68588012') format('woff'),
-       url('../font/opex-icon.ttf?68588012') format('truetype'),
-       url('../font/opex-icon.svg?68588012#opex-icon') format('svg');
+  src: url('../font/opex-icon.eot?10078372');
+  src: url('../font/opex-icon.eot?10078372#iefix') format('embedded-opentype'),
+       url('../font/opex-icon.woff2?10078372') format('woff2'),
+       url('../font/opex-icon.woff?10078372') format('woff'),
+       url('../font/opex-icon.ttf?10078372') format('truetype'),
+       url('../font/opex-icon.svg?10078372#opex-icon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'opex-icon';
-    src: url('../font/opex-icon.svg?68588012#opex-icon') format('svg');
+    src: url('../font/opex-icon.svg?10078372#opex-icon') format('svg');
   }
 }
 */
@@ -142,6 +142,10 @@
 .icon-username-icon:before { content: '\0219'; } /* 'ș' */
 .icon-user-key-icon:before { content: '\0220'; } /* 'Ƞ' */
 .icon-exchange-arrow:before { content: '\0221'; } /* 'ȡ' */
+.icon-down:before { content: '\0222'; } /* 'Ȣ' */
+.icon-left:before { content: '\0223'; } /* 'ȣ' */
+.icon-right:before { content: '\0224'; } /* 'Ȥ' */
+.icon-up:before { content: '\0225'; } /* 'ȥ' */
 .icon-market:before { content: '\e800'; } /* '' */
 .icon-cancel-circled2:before { content: '\e801'; } /* '' */
 .icon-settings:before { content: '\e802'; } /* '' */

src/assets/fontIcon/opex-icon/demo.html

@@ -146,11 +146,11 @@
     }
     @font-face {
       font-family: 'opex-icon';
-      src: url('./font/opex-icon.eot?38978101');
-      src: url('./font/opex-icon.eot?38978101#iefix') format('embedded-opentype'),
-           url('./font/opex-icon.woff?38978101') format('woff'),
-           url('./font/opex-icon.ttf?38978101') format('truetype'),
-           url('./font/opex-icon.svg?38978101#opex-icon') format('svg');
+      src: url('./font/opex-icon.eot?66818317');
+      src: url('./font/opex-icon.eot?66818317#iefix') format('embedded-opentype'),
+           url('./font/opex-icon.woff?66818317') format('woff'),
+           url('./font/opex-icon.ttf?66818317') format('truetype'),
+           url('./font/opex-icon.svg?66818317#opex-icon') format('svg');
       font-weight: normal;
       font-style: normal;
     }
@@ -518,6 +518,20 @@ <h1>opex-icon <small>font demo</small></h1>
           <i class="demo-icon icon-exchange-arrow">&#x0221;</i> <span class="i-name">icon-exchange-arrow</span><span class="i-code">0x0221</span>
         </div>
       </div>
+      <div class="row">
+        <div class="span3" title="Code: 0x0222">
+          <i class="demo-icon icon-down">&#x0222;</i> <span class="i-name">icon-down</span><span class="i-code">0x0222</span>
+        </div>
+        <div class="span3" title="Code: 0x0223">
+          <i class="demo-icon icon-left">&#x0223;</i> <span class="i-name">icon-left</span><span class="i-code">0x0223</span>
+        </div>
+        <div class="span3" title="Code: 0x0224">
+          <i class="demo-icon icon-right">&#x0224;</i> <span class="i-name">icon-right</span><span class="i-code">0x0224</span>
+        </div>
+        <div class="span3" title="Code: 0x0225">
+          <i class="demo-icon icon-up">&#x0225;</i> <span class="i-name">icon-up</span><span class="i-code">0x0225</span>
+        </div>
+      </div>
       <div class="row">
         <div class="span3" title="Code: 0xe800">
           <i class="demo-icon icon-market">&#xe800;</i> <span class="i-name">icon-market</span><span class="i-code">0xe800</span>

src/components/ToggleSwitch/ToggleSwitch.module.css

@@ -17,7 +17,7 @@
     right: 0;
     bottom: 0;
     border-radius: 34px;
-    background-color: var(--menu);
+    background-color: var(--textColor);
     -webkit-transition: .4s;
     transition: .4s;
 }

src/main/Mobile/Pages/EasyTrading/components/EasyOrder/EasyOrder.js

@@ -13,6 +13,10 @@ import TextInput from "../../../../../../components/TextInput/TextInput";
 import Icon from "../../../../../../components/Icon/Icon";
 import NumberInput from "../../../../../../components/NumberInput/NumberInput";
 import Button from "../../../../../../components/Button/Button";
+import {Link} from "react-router-dom";
+import * as Routes from "../../../../Routes/routes";
+import i18n from "i18next";
+import {TxHistory} from "../../../../Routes/routes";
 
 const EasyOrder = () => {
 
@@ -327,6 +331,13 @@ const EasyOrder = () => {
             <div className={`${classes.header} card-header-bg row jc-between ai-center px-5 py-3 width-100 fs-02`}>
                 <span>{t("MarketTitle.easyTrading")}</span>
 
+                <div className={`row jc-center ai-center cursor-pointer hover-text fs-0-9`}>
+                    <Link to={Routes.TxHistory} className={`ml-05 hover-text`}>{t("txHistory.title")}</Link>
+                    <Icon
+                        iconName={`${i18n.language !== "fa" ? 'icon-right-open-1' : 'icon-left-open-1'}  fs-0-9 flex`}
+                        className={`mr-05`}/>
+                </div>
+
             </div>
 
             <div className={`width-100 column jc-between ai-center py-3 ${classes.content}`} >

src/main/Mobile/Pages/Login/components/ForgetPassword/ForgetPassword.js

@@ -84,7 +84,7 @@ const ForgetPassword = ({returnFunc}) => {
                 setSuccess(true)
             })
             .catch((err) => {
-                if (err?.status === 400 && err?.data?.error === "InvalidCaptcha") {
+                if (err?.response?.data?.error === "InvalidCaptcha") {
                     setForgetPass({...forgetPass, captchaAnswer: {value: "", error: [t("login.InvalidCaptcha")]}})
                 } else {
                     setForgetPass({