diff --git a/src/langs/fa.json b/src/langs/fa.json index 3eec5e4..ac6fd48 100644 --- a/src/langs/fa.json +++ b/src/langs/fa.json @@ -328,7 +328,13 @@ "mix_charachter_number": "ترکیبی از حروف کوچک و بزرگ باشد", "exsist_number": "شامل اعداد باشد", "exsist_special_character": "شامل کاراکتر های خاص (نماد ها) باشد", - "password_changed": "رمز عبور با موفقیت تغییر یافت" + "password_changed": "رمز عبور با موفقیت تغییر یافت", + "SUPPORT": "پشتیبانی", + "SERVICE": "سرویس", + "INVOICE": "صورتحساب", + "ACCOUNT": "حساب", + "NOTIFICATION": "اعلان", + "FINANCE": "مالی" }, "wallet": { "increese_wallet": "افزایش موجودی حساب اعتباری", diff --git a/src/pages/home/components/DanakLearning.tsx b/src/pages/home/components/DanakLearning.tsx index 021120f..9fe6f5b 100644 --- a/src/pages/home/components/DanakLearning.tsx +++ b/src/pages/home/components/DanakLearning.tsx @@ -30,7 +30,7 @@ const DanakLearning: FC = () => { return (
- danak-learning-1 + danak-learning-1
diff --git a/src/pages/service/BuyService.tsx b/src/pages/service/BuyService.tsx index 8c72660..4b1b486 100644 --- a/src/pages/service/BuyService.tsx +++ b/src/pages/service/BuyService.tsx @@ -41,7 +41,7 @@ const BuyService: FC = () => { buyService.mutate(values, { onSuccess: () => { toast.success(t('success')) - navigate(Pages.services.mine) + navigate(Pages.receipts.index) }, onError: (error: ErrorType) => { toast.error(error.response?.data?.error.message[0]) diff --git a/src/pages/setting/Setting.tsx b/src/pages/setting/Setting.tsx index 3ade3cd..be865c8 100644 --- a/src/pages/setting/Setting.tsx +++ b/src/pages/setting/Setting.tsx @@ -7,6 +7,7 @@ import PageLoading from '../../components/PageLoading' import Sms from './components/Sms' import ChangePassword from './components/ChangePassword' import { Helmet } from 'react-helmet-async' +import TitleLine from '../../components/TitleLine' const Setting: FC = () => { @@ -61,6 +62,9 @@ const Setting: FC = () => { getSettings.data?.data?.settings?.map((item: any) => { return ( + { item.settings?.map((item: any) => { return ( diff --git a/src/pages/transaction/List.tsx b/src/pages/transaction/List.tsx index 1d34693..06ab366 100644 --- a/src/pages/transaction/List.tsx +++ b/src/pages/transaction/List.tsx @@ -52,7 +52,6 @@ const TransactionList: FC = () => {
-
{getTransactions.data?.data?.totalDepositsPercentChange || 0}٪
@@ -69,9 +68,8 @@ const TransactionList: FC = () => {
{NumberFormat(getTransactions.data?.data?.totalWithdrawals)} {t('toman')}
-
- -
{getTransactions.data?.data?.totalWithdrawalsPercentChange || 0}٪
+
+
@@ -88,10 +86,6 @@ const TransactionList: FC = () => {
{NumberFormat(getTransactions.data?.data?.balance)} {t('toman')}
-
- -
{getTransactions.data?.data?.balancePercentChange || 0}٪
-
diff --git a/src/pages/wallet/components/Online.tsx b/src/pages/wallet/components/Online.tsx index 216dfa4..6a2d28c 100644 --- a/src/pages/wallet/components/Online.tsx +++ b/src/pages/wallet/components/Online.tsx @@ -1,4 +1,4 @@ -import { FC, useState } from 'react' +import { FC, useEffect, useState } from 'react' import Button from '../../../components/Button' import { useTranslation } from 'react-i18next' import { clx } from '../../../helpers/utils' @@ -42,6 +42,11 @@ const Online: FC = () => { } } + useEffect(() => { + setDesiredAmount(amountSelected) + }, [amountSelected]) + + return (
@@ -71,6 +76,7 @@ const Online: FC = () => { label={t('wallet.optional_price')} placeholder={t('wallet.enter_your_price')} onChange={(e) => setDesiredAmount(Number(e.target.value))} + value={desiredAmount} />
diff --git a/src/shared/Footer.tsx b/src/shared/Footer.tsx index 51bdd62..9fee9c5 100644 --- a/src/shared/Footer.tsx +++ b/src/shared/Footer.tsx @@ -13,7 +13,7 @@ const Footer: FC = () => { return (
-
+
{
- +
setPopoverKey((prevKey) => prevKey + 1)} size={20} color='black' />
-
+
@@ -90,7 +90,7 @@ const Header: FC = () => {
{data?.data?.user?.email}
-
+