From 1428af11925fe9a1f76825634cc4cfb5c9561770 Mon Sep 17 00:00:00 2001 From: Hossein Date: Mon, 21 Oct 2024 11:15:28 +0330 Subject: [PATCH 1/2] Update translation file --- public/assets/locales/en/translation.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/locales/en/translation.json b/public/assets/locales/en/translation.json index 0d783c70..50f1e01c 100644 --- a/public/assets/locales/en/translation.json +++ b/public/assets/locales/en/translation.json @@ -392,11 +392,11 @@ "cancelPayment": "Payment operation canceled!" }, "DepositTx": { - "title": "Last 10 {{currency}} deposit transactions.", + "title": "Last 10 {{currency}} deposit transactions", "showAll": "Show All" }, "WithdrawTx": { - "title": "Last 10 {{currency}} withdraw transactions.", + "title": "Last 10 {{currency}} withdraw transactions", "cancelWithdrawReq": "Cancel withdrawal request", "cancelWithdrawReqSuccess": "Withdrawal request has been successfully canceled" }, From 7c8bffd2dd75bad056d845f570878d120cbc9b16 Mon Sep 17 00:00:00 2001 From: Hossein Date: Mon, 21 Oct 2024 12:53:15 +0330 Subject: [PATCH 2/2] Close #229: Add defaultConfigs --- src/setup/configs/configs.js | 13 +++++++++++++ src/store/sagas/global.js | 13 ++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/setup/configs/configs.js diff --git a/src/setup/configs/configs.js b/src/setup/configs/configs.js new file mode 100644 index 00000000..2feded4f --- /dev/null +++ b/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" +} \ No newline at end of file diff --git a/src/store/sagas/global.js b/src/store/sagas/global.js index 5ac772a1..50bf2d48 100644 --- a/src/store/sagas/global.js +++ b/src/store/sagas/global.js @@ -3,6 +3,8 @@ 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 +83,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;