Support new currencies

.github/workflows/dev.yml

@@ -17,12 +17,12 @@ jobs:
       - name: Build Docker images
         env:
           GENERATE_SOURCEMAP: '' 
-        run: docker-compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push images to GitHub Container Registry
-        run: docker-compose -f docker-compose.build.yml push
+        run: docker compose -f docker-compose.build.yml push

.github/workflows/main.yml

@@ -25,4 +25,4 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push images to GitHub Container Registry
-        run: docker-compose -f docker-compose.build.yml push
+        run: docker compose -f docker-compose.build.yml push

.github/workflows/pr.yml

@@ -15,4 +15,4 @@ jobs:
         env:
           TAG: latest
           GENERATE_SOURCEMAP: false
-        run: docker-compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build

public/assets/locales/en/translation.json

@@ -84,7 +84,9 @@
     "TBNB": "TBNB",
     "TBUSD": "TBUSD",
     "BCH": "BCH",
-    "TRX": "TRX"
+    "TRX": "TRX",
+    "SOL": "SOL",
+    "TON": "TON"
   },
   "marketInterval": {
     "24h": "24 hours",

public/assets/locales/fa/translation.json

@@ -84,7 +84,9 @@
     "TBNB": "بایننس (ت)",
     "TBUSD": "دلار بایننس(ت)",
     "BCH": "بیتکوین کش",
-    "TRX": "ترون"
+    "TRX": "ترون",
+    "SOL": "سولانا",
+    "TON": "تون کوین"
   },
   "marketInterval": {
     "24h": "24 ساعت",

src/assets/images.js

@@ -20,6 +20,8 @@ import tron from "./images/src/tron.svg";
 import testTron from "./images/src/testTron.svg";
 import ethereumLight from "./images/src/ethereumLight.svg";
 import toman from "./images/src/toman.svg";
+import toncoin from "./images/src/toncoin.svg";
+import solana from "./images/src/solana.svg";
 import spaceStar from "./images/src/spaceStar.png";
 import astronaut from "./images/src/astronaut.svg";
 import astronautAlone from "./images/src/astronautAlone.svg";
@@ -64,6 +66,8 @@ export const images = {
   TTRX: testTron,
   ETH: ethereumLight,
   IRT: toman,
+  TON: toncoin,
+  SOL: solana,
   spaceStar: spaceStar,
   astronaut: astronaut,
   astronautAlone: astronautAlone,

src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/TradingView/components/MarketChart/MarketChart.js

@@ -10,9 +10,13 @@ import {
 } from "../../../../../../../../../../../../constants/chart";
 import i18n from "i18next";
 import {useGetChartCandlesticks} from "../../../../../../../../../../../../queries";
+import {useTranslation} from "react-i18next";
 
 
 const MarketChart = ({type}) => {
+
+    const {t} = useTranslation();
+
     let chartProperties, candleSeries, volumeSeries;
     const chart = useRef();
 
@@ -159,7 +163,7 @@ const MarketChart = ({type}) => {
 
     return (
         <div ref={chartContainerRef} className={`width-100  ${classes.chartContainer}`}>
-            <p className={classes.error}>{error}</p>
+            <p className={classes.error}>{error && t('charts.noChartData')}</p>
         </div>
     );
 };

src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/TransactionHistory.js

@@ -154,7 +154,7 @@ const TransactionHistory = () => {
                         value: query?.coin,
                         label:  query?.coin ? t('currency.'+ query?.coin) : t('all'),
                     }}
-                    onchange={(e) => setQuery({...query, coin: e.value})}
+                    onchange={(e) => setQuery({...query, coin: e.value, offset:0})}
                     customClass={`width-100 my-1 ${classes.thisInput}`}
                 />
                 <TextInput
@@ -167,7 +167,7 @@ const TransactionHistory = () => {
                         value: query?.category,
                         label: query?.category ? t('TransactionCategory.'+ query?.category) : t('all'),
                     }}
-                    onchange={(e) => setQuery({...query, category: e.value})}
+                    onchange={(e) => setQuery({...query, category: e.value, offset:0})}
                     customClass={`width-100 my-1 ${classes.thisInput}`}
                 />
                 <TextInput

src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.js

@@ -32,8 +32,8 @@ const WalletSubMenu = () => {
                             </div>
                             <WalletBalance/>
                             <ScrollBar customClass={`column`}>
-                                {assets.filter(asset => data.wallets[asset].free > 0)
-                                    .concat(assets.filter(asset => data.wallets[asset].free === 0))
+                                {assets.filter(asset => data?.wallets?.[asset]?.free > 0)
+                                    .concat(assets.filter(asset => data?.wallets?.[asset]?.free === 0))
                                     .map((name) => <WalletListItem key={name} assetName={name} showZero={showZero}/>)}
                             </ScrollBar>
                         </div>

src/setup/configs/configs.js

@@ -0,0 +1,13 @@
+export const defaultConfigs = {
+    "logoUrl": "logo/url",
+    "title": "Title",
+    "description": "Description text",
+    "defaultLanguage": "en",
+    "supportedLanguages": [
+        "en"
+    ],
+    "defaultTheme": "DARK",
+    "supportEmail": "supportEmail@gmail.com",
+    "baseCurrency": "TUSDT",
+    "dateType": "Hijri"
+}

src/store/sagas/global.js

@@ -3,6 +3,7 @@ import * as actions from "../actions/index";
 import jwtDecode from "jwt-decode";
 import axios from "axios";
 import i18n from "i18next";
+import {defaultConfigs} from "../../setup/configs/configs";
 
 export function* setThemeSaga(action) {
     try {
@@ -81,14 +82,23 @@ export function* loadConfig(action) {
         const {
             data: {
                 defaultTheme,
+                language,
                 ...configs
             }
         } = yield call(axios.get, '/config/web/v1')
 
         yield put(actions.setExchangeConfigs(configs));
-
+        i18n.changeLanguage(language)
         appTheme = defaultTheme;
 
+
+    } catch (e) {
+        i18n.changeLanguage(defaultConfigs?.defaultLanguage)
+        appTheme = defaultConfigs?.defaultTheme;
+        yield put(actions.setExchangeConfigs(defaultConfigs));
+    }
+
+    try {
         const localTheme = yield call([localStorage, 'getItem'], 'theme')
         if (localTheme) appTheme = localTheme;