-
- Open in Mobile ...
-
-
- );
-};
-
+ window.location.replace(redirectURL);
+}
export default Browser;
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/Settings.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/Settings.js
index 3a5942e..be67dd8 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/Settings.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/Settings.js
@@ -1,18 +1,50 @@
import React from "react";
-import ToggleSwitch from "../../../../../../../../components/ToggleSwitch/ToggleSwitch";
import {setThemeInitiate} from "../../../../../../../../store/actions";
import {connect} from "react-redux";
-import {useTranslation} from "react-i18next";
+import {Navigate, Route, Routes, useParams} from "react-router-dom";
+import Profile from "./components/Profile/Profile";
+import Security from "./components/Security/Security";
+import Authentication from "./components/Authentication/Authentication";
+import APIKey from "./components/APIKey/APIKey";
+import * as RoutesName from "../../../../../../Routes/routes";
const Settings = (props) => {
- const {t} = useTranslation();
+
+ const {path} = useParams()
+
+ console.log(path)
+
+ const content = () => {
+
+ if (path === "profile") {
+ return
- {t("comingSoon")}
- props.onThemeChange(e.target.checked)} checked={props.isDark}/>
+ setStep(2)}/>;
+ case 2:
+ return (
+ setStep(1)}
+ nextStep={() => setStep(3)}
+ />
+ );
+ case 3:
+ return (
+ setStep(2)}
+ nextStep={() => setStep(4)}
+ />
+ );
+ case 4:
+ return setStep(3)}/>;
+ default:
+ return
+
+ );
+};
+
+export default Profile;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/Profile.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/Profile.module.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/components/PersonalProfile/PersonalProfile.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/components/PersonalProfile/PersonalProfile.js
new file mode 100644
index 0000000..179fca5
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/components/PersonalProfile/PersonalProfile.js
@@ -0,0 +1,150 @@
+import React from 'react';
+import classes from './PersonalProfile.module.css'
+import {useTranslation} from "react-i18next";
+import {useNavigate} from "react-router-dom";
+import {useSelector} from "react-redux";
+import {useGetUserAttributes} from "../../../../../../../../../../../../queries";
+import Loading from "../../../../../../../../../../../../components/Loading/Loading";
+import TextInput from "../../../../../../../../../../../../components/TextInput/TextInput";
+import * as RoutesName from "../../../../../../../../../../Routes/routes";
+import Button from "../../../../../../../../../../../../components/Button/Button";
+import {images} from "../../../../../../../../../../../../assets/images";
+
+const PersonalProfile = () => {
+
+ const {t} = useTranslation();
+ const navigate = useNavigate();
+ const KYCStatus = useSelector(state => state.auth.kyc);
+ const KYCReason = useSelector(state => state.auth.kycReason);
+
+ const {data: profile, isLoading} = useGetUserAttributes()
+
+ const content = () => {
+ if (isLoading) {
+ return
+
+ );
+};
+
+export default Security;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/Security.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/Security.module.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/ActiveSessions.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/ActiveSessions.js
new file mode 100644
index 0000000..8102928
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/ActiveSessions.js
@@ -0,0 +1,84 @@
+import React from 'react';
+import classes from './ActiveSessions.module.css'
+import {useTranslation} from "react-i18next";
+import {useGetUserActiveSessions} from "../../../../../../../../../../../../queries";
+import {expireAllSessionsExceptCurrent} from "js-api-client";
+import {toast} from "react-hot-toast";
+import Icon from "../../../../../../../../../../../../components/Icon/Icon";
+import ScrollBar from "../../../../../../../../../../../../components/ScrollBar";
+import Error from "../../../../../../../../../../../../components/Error/Error";
+import Loading from "../../../../../../../../../../../../components/Loading/Loading";
+import moment from "moment-jalaali";
+import Session from "./components/Session/Session";
+
+const ActiveSessions = () => {
+
+ const {t} = useTranslation();
+ const {data: activeSessions, isLoading, error, refetch} = useGetUserActiveSessions()
+
+ const expireAllSessions = () => {
+ expireAllSessionsExceptCurrent()
+ .then(() => {
+ toast.success(t("ActiveSessions.logOutAllSuccess"));
+ refetch()
+ }).catch(() => {
+ toast.error(t("ActiveSessions.logOutAllError"));
+ })
+ }
+
+ const content = () => {
+ if (isLoading) return
+ {other.length > 0 ? other.map((list) => )
+ :
+
+ }
+
+ return (
+
+
+
+
+ }/>
+ }/>
+ }/>
+ }/>
+
+
);
};
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/APIKey/APIKey.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/APIKey/APIKey.js
new file mode 100644
index 0000000..f064d8a
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/APIKey/APIKey.js
@@ -0,0 +1,11 @@
+import React from 'react';
+
+const APIKey = () => {
+ return (
+
+
+
+ );
+};
+
+export default APIKey;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/APIKey/APIKey.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/APIKey/APIKey.module.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/Authentication.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/Authentication.js
new file mode 100644
index 0000000..f786c89
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/Authentication.js
@@ -0,0 +1,120 @@
+import React, {useEffect, useState} from 'react';
+import ScrollBar from "../../../../../../../../../../components/ScrollBar";
+import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
+import HelpStep from "./components/HelpStep/HelpStep";
+import PersonalProfileStep from "./components/PersonalProfileStep/PersonalProfileStep";
+import SendPhotosStep from "./components/SendPhotosStep/SendPhotosStep";
+import SendToAdminStep from "./components/SendToAdminStep/SendToAdminStep";
+
+const Authentication = () => {
+
+ const {t} = useTranslation();
+ const [step, setStep] = useState(1);
+
+ const KYCStatus = useSelector(state => state.auth.kyc);
+
+ useEffect(()=>{
+ if (KYCStatus && KYCStatus !== "NOT_REQUESTED" ) {
+ setStep(4)
+ }
+ }, [KYCStatus])
+
+ const titleHandler = () => {
+
+ if (step === 1) return t("Authentication.HelpStep")
+ if (step === 2) return t("Authentication.PersonalProfileStep")
+ if (step === 3) return t("Authentication.SendPhotosStep")
+ if (step === 4) return t("Authentication.SendToAdminStep")
+
+ }
+
+ const stepSwitch = (step) => {
+ switch (step) {
+ case 1:
+ return
+
+ {stepSwitch(step)}
+
+
+ );
+};
+
+export default Authentication;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/Authentication.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/Authentication.module.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/HelpStep/HelpStep.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/HelpStep/HelpStep.js
new file mode 100644
index 0000000..f8d4309
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/HelpStep/HelpStep.js
@@ -0,0 +1,30 @@
+import React from 'react';
+import classes from "./HelpStep.module.css";
+import {useTranslation} from "react-i18next";
+import Button from "../../../../../../../../../../../../components/Button/Button";
+
+const HelpStep = ({nextStep}) => {
+ const {t} = useTranslation();
+
+ return (
+
+ {titleHandler()}
+
+
+ {step === 1 ? (
+
+ ) : (
+ ""
+ )}
+ {step === 2 ? (
+
+ ) : (
+ ""
+ )}
+ {step === 3 ? (
+
+ ) : (
+ ""
+ )}
+ {step === 4 ? (
+
+ ) : (
+ ""
+ )}
+
+
+
+ );
+};
+
+export default HelpStep;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/HelpStep/HelpStep.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/HelpStep/HelpStep.module.css
new file mode 100644
index 0000000..016a397
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/HelpStep/HelpStep.module.css
@@ -0,0 +1,13 @@
+.container {
+ height: 100%;
+}
+.header {
+ height: 12%;
+}
+.content {
+ height: 88%;
+}
+.thisButton {
+ width: 30%;
+ background-color: var(--darkGreen);
+}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/PersonalProfileStep/PersonalProfileStep.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/PersonalProfileStep/PersonalProfileStep.js
new file mode 100644
index 0000000..0cf4e4f
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/PersonalProfileStep/PersonalProfileStep.js
@@ -0,0 +1,313 @@
+import React, {useEffect, useState} from 'react';
+import classes from "./PersonalProfileStep.module.css";
+import {Trans, useTranslation} from "react-i18next";
+import {useDispatch, useSelector} from "react-redux";
+import {getUserAttributes, setUserProfileAttributes} from "js-api-client";
+import {changeUserInfo} from "../../../../../../../../../../../../store/actions";
+import moment from "moment-jalaali";
+import {isValidNationalCode} from "../../../../../../../../../../../../utils/utils";
+import TextInput from "../../../../../../../../../../../../components/TextInput/TextInput";
+import Loading from "../../../../../../../../../../../../components/Loading/Loading";
+import Button from "../../../../../../../../../../../../components/Button/Button";
+
+const PersonalProfileStep = (props) => {
+
+ const {t} = useTranslation();
+ const [loading, setLoading] = useState(true)
+ const [error, setError] = useState([])
+ const dispatch = useDispatch();
+ const email = useSelector((state) => state.auth.email)
+
+ const [profile, setProfile] = useState({
+ firstName: {value: "", error: []},
+ lastName: {value: "", error: []},
+ nationality: {value: "", error: []},
+ residence: {value: "", error: []},
+ birthday: {value: "", error: []},
+ idNumber: {value: "", error: []},
+ mobile: {value: "", error: []},
+ postalCode: {value: "", error: []},
+ address: {value: "", error: []},
+ });
+ const countries = [
+ {value: "iran", label: t('country.iran')},
+ {value: "germany", label: t('country.germany')},
+ {value: "uk", label: t('country.uk')},
+ {value: "turkey", label: t('country.turkey')},
+ ]
+
+ const convertUserInfoToState = (info) => {
+ const newState = {...profile}
+ for (const [key, value] of Object.entries(info)) {
+ newState[key] = {value: value, error: []}
+ }
+ setProfile(newState)
+ }
+
+ const convertStateToUserInfo = () => {
+ const newState = {}
+ for (const [key, value] of Object.entries(profile)) {
+ newState[key] = value.value
+ }
+ return newState
+ }
+
+ const getUser = () => {
+ setLoading(true)
+ setError([])
+ getUserAttributes().then((res) => {
+ convertUserInfoToState(res.data)
+ }).catch(() => {
+ setError([t("PersonalProfileStep.serverError")])
+ }).finally(() => {
+ setLoading(false)
+ })
+ }
+ useEffect(() => {
+ getUser()
+ }, [])
+
+ const sendProfile = async () => {
+ if (!isFormValid()) return
+ setLoading(true)
+
+ const data = convertStateToUserInfo()
+ delete data.email;
+ delete data.username;
+ delete data.passportNumber;
+ delete data.birthdayG;
+ delete data.birthdayJ;
+ delete data.nationalId;
+ delete data.telephone;
+ delete data.selfiePath;
+ delete data.idCardPath;
+ delete data.acceptFormPath;
+
+
+ setUserProfileAttributes(data)
+ .then(() => {
+ setError([])
+ dispatch(changeUserInfo(profile.firstName.value, profile.lastName.value))
+ props.nextStep()
+ })
+ .catch(() => {
+ setError([t("PersonalProfileStep.serverError")])
+ })
+ .finally(() => {
+ setLoading(false)
+ })
+ }
+
+ const inputHandler = (e) => {
+ let errorMessage = []
+ let inputVal = e.target.value
+ if (typeof e.target.dataset?.min && inputVal.length < e.target.dataset.min) {
+ errorMessage.push(
+
+
+
+ {t("HelpStep.title")}
+
+ {t("HelpStep.content")}
+
+
+
+
+
+
+ );
+};
+
+export default PersonalProfileStep;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/PersonalProfileStep/PersonalProfileStep.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/PersonalProfileStep/PersonalProfileStep.module.css
new file mode 100644
index 0000000..f2e9035
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/PersonalProfileStep/PersonalProfileStep.module.css
@@ -0,0 +1,34 @@
+.container {
+ min-height: 65vh;
+}
+
+.content :global(.row) {
+ width: 100%;
+}
+.addressInput :global(.lead) {
+ width: 24.5%;
+}
+.addressInput :global(input) {
+ width: 75.5%;
+}
+.thisButton {
+ width: 30%;
+}
+.thisButton.prev{
+ background-color: var(--orange);
+}
+.thisButton.next{
+ background-color: var(--darkGreen);
+}
+.email :global(input){
+ background-color: var(--cardHeader);
+ cursor: not-allowed;
+}
+
+.thisInput :global(.lead) {
+ width: 40%;
+}
+.thisInput :global(input) {
+ width: 60%;
+}
+
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendPhotosStep/SendPhotosStep.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendPhotosStep/SendPhotosStep.js
new file mode 100644
index 0000000..ae97454
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendPhotosStep/SendPhotosStep.js
@@ -0,0 +1,125 @@
+import React, {useState} from 'react';
+import classes from "./SendPhotosStep.module.css";
+import {sendFileToUserStorage, setKycFileToUserAttributes} from "js-api-client";
+import {toast} from "react-hot-toast";
+import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
+import ImageInput from "../../../../../../../../../../../../components/ImageInput/ImageInput";
+import Button from "../../../../../../../../../../../../components/Button/Button";
+
+const SendPhotosStep = (props) => {
+
+ const {t} = useTranslation();
+
+ const [sending, setSending] = useState(false);
+ const [images, setImages] = useState({
+ img1: "",
+ img2: "",
+ img3: "",
+ });
+ const id = useSelector(state => state.auth.id);
+
+ const sendImageHandler = async () => {
+ if (images.img1 === "") {
+ toast.error(t("SendPhotosStep.acceptFormEmpty"));
+ return;
+ }
+ if (images.img2 === "") {
+ toast.error(t("SendPhotosStep.selfieEmpty"));
+ return;
+ }
+ if (images.img3 === "") {
+ toast.error(t("SendPhotosStep.idCardEmpty"));
+ return;
+ }
+ setSending(true)
+ const acceptForm = await sendFileToUserStorage(id, images.img1)
+ const selfie = await sendFileToUserStorage(id, images.img2)
+ const idCard = await sendFileToUserStorage(id, images.img3)
+ if (acceptForm.status === 200 && selfie.status === 200 && idCard.status === 200) {
+ const paths = {
+ selfiePath: `${selfie.data.path}`,
+ idCardPath: `${idCard.data.path}`,
+ acceptFormPath: `${acceptForm.data.path}`
+ }
+ setKycFileToUserAttributes(paths)
+ .then(() => {
+ setSending(false)
+ props.nextStep()
+ }).catch(() => {
+ toast.error(t("SendPhotosStep.serverError"));
+ setImages({...images})
+ })
+ } else {
+ toast.error(t("SendPhotosStep.serverError"));
+ }
+ setSending(false)
+ }
+
+ return (
+
+
+ {loading ?
+
+ {t("PersonalProfileStep.title")}
+
+ inputHandler(e)}
+ alerts={profile.firstName.error}
+ />
+ inputHandler(e)}
+ alerts={profile.lastName.error}
+ />
+ v.value === profile.nationality.value)}
+ lead={t('PersonalProfile.nationality')}
+ type="select"
+ onchange={(e) => setProfile({...profile, nationality: {value: e.value, error: []}})}
+ alerts={profile.nationality.error}
+ />
+ v.value === profile.residence.value)}
+ type="select"
+ options={countries}
+ onchange={(e) => setProfile({...profile, residence: {value: e.value, error: []}})}
+ alerts={profile.residence.error}
+ />
+
+
+ inputHandler(e)}
+ alerts={profile.birthday.error}
+ />
+ inputHandler(e)}
+ alerts={profile.idNumber.error}
+ //maxLength="10"
+ />
+
+ inputHandler(e)}
+ alerts={profile.mobile.error}
+ />
+ inputHandler(e)}
+ alerts={profile.postalCode.error}
+ />
+ inputHandler(e)}
+ alerts={profile.address.error}
+ />
+
+ }
+
+
+
+
+ {error.length !== 0 && error}
+
+
+
+
+
+
+
+ );
+};
+
+export default SendPhotosStep;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendPhotosStep/SendPhotosStep.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendPhotosStep/SendPhotosStep.module.css
new file mode 100644
index 0000000..ec19fef
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendPhotosStep/SendPhotosStep.module.css
@@ -0,0 +1,38 @@
+.container {
+ min-height: 65vh;
+}
+.header {
+ height: 12%;
+}
+.content {
+ height: 88%;
+}
+.thisButton {
+ width: 30%;
+}
+.thisButton.prev{
+ background-color: var(--orange);
+}
+.thisButton.next{
+ background-color: var(--darkGreen);
+}
+
+.zoneBox {
+ width: 100%;
+ padding: 2vh 3vw;
+ border-radius: 10px;
+ border: 0.3vh dotted var(--cardBorder);
+}
+.cancel {
+ top: 1.2vh;
+ left: 2.1vw;
+}
+.zone {
+ padding: 2vh 5vw;
+ height: 40vh;
+ border-radius: 10px;
+ background-repeat: no-repeat;
+ background-position: center center;
+ background-size: cover;
+ background-color: var(--cardHeader);
+}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendToAdminStep/SendToAdminStep.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendToAdminStep/SendToAdminStep.js
new file mode 100644
index 0000000..781f81f
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendToAdminStep/SendToAdminStep.js
@@ -0,0 +1,74 @@
+import React, {useEffect} from 'react';
+import {useTranslation} from "react-i18next";
+import classes from "./SendToAdminStep.module.css";
+import {useDispatch, useSelector} from "react-redux";
+import {setKYCStatusInitiate} from "../../../../../../../../../../../../store/actions";
+import {images} from "../../../../../../../../../../../../assets/images";
+import Button from "../../../../../../../../../../../../components/Button/Button";
+
+const SendToAdminStep = ({prevStep}) => {
+
+ const {t} = useTranslation();
+ const dispatch = useDispatch();
+ const KYCStatus = useSelector(state => state.auth.kyc);
+ const KYCReason = useSelector(state => state.auth.kycReason);
+
+ useEffect(() => {
+ dispatch(setKYCStatusInitiate());
+ }, []);
+
+ const content = () => {
+ if (KYCStatus === "REQUESTED") {
+ return
+
+
+
+ {t("SendPhotosStep.title")}
+
+
+
+ {t("SendPhotosStep.content")}
+ {t("SendPhotosStep.acceptForm")}{" "}{" "}{t("SendPhotosStep.acceptFormLink")}
+ {t("SendPhotosStep.selfie")}{" "}{" "}{t("SendPhotosStep.selfieLink")}
+ {t("SendPhotosStep.idCard")}{" "}
+ {" "}{t("SendPhotosStep.idCardLink")}
+
+
+
+ {sending ?
+ setImages({...images, img1: url})}
+ />
+ setImages({...images, img2: url})}
+ />
+ setImages({...images, img3: url})}
+ />
+
+ }
+
+
+ {t("SendPhotosStep.sendingData")}
+
+ :
+ <>
+
+
+
+ {t("SendPhotosStep.imageAcceptedFormat")}
+ {t("SendPhotosStep.imageAcceptedSize")}
+
+
+
+
+
+
+ 
+ {t("SendToAdminStep.pending")}
+
+ }
+ if (KYCStatus === "ACCEPTED") {
+ return
+ 
+ {t("SendToAdminStep.accepted")}
+
+ }
+ if (KYCStatus === "REJECTED") {
+ return
+ 
+ {t("SendToAdminStep.rejected")}
+ {t("SendToAdminStep.errorMessage")}: {KYCReason === undefined ? t("SendToAdminStep.noData") : KYCReason}
+
+
+ }
+ if (KYCStatus === "BLOCKED") {
+ return
+ 
+ {t("SendToAdminStep.blocked")}
+ {t("SendToAdminStep.errorMessage")}: {KYCReason}
+
+ }
+ }
+
+ return (
+
+
+ );
+};
+
+export default SendToAdminStep;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendToAdminStep/SendToAdminStep.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendToAdminStep/SendToAdminStep.module.css
new file mode 100644
index 0000000..07916e7
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Authentication/components/SendToAdminStep/SendToAdminStep.module.css
@@ -0,0 +1,21 @@
+.container {
+ height: 100%;
+}
+.header {
+ height: 12%;
+}
+.content {
+ height: 88%;
+}
+.thisButton {
+ width: 10%;
+}
+.thisButton.prev{
+ background-color: var(--orange);
+}
+.thisButton.submit{
+ background-color: var(--darkGreen);
+}
+.content img{
+ width: 25%;
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/Profile.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/Profile.js
new file mode 100644
index 0000000..4abac21
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/Profile.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import ScrollBar from "../../../../../../../../../../components/ScrollBar";
+import PersonalProfile from "./components/PersonalProfile/PersonalProfile";
+
+const Profile = () => {
+ return (
+
+
+
+
+ {t("SendToAdminStep.title")}
+
+ {t("SendToAdminStep.content")}
+
+
+ {content()}
+
+
+ {KYCStatus === "REJECTED" && }
+
+
+
+ {t('SendToAdminStep.pending')}
+
+ }
+ if (KYCStatus === "REJECTED") {
+ return
+
+ {t("SendToAdminStep.rejected")}
+ {t("SendToAdminStep.errorMessage")}: {KYCReason === undefined ? t("SendToAdminStep.noData") : KYCReason}
+
+ }
+ if (KYCStatus === "BLOCKED") {
+ return
+
+ {t('SendToAdminStep.blocked')}
+ {t("SendToAdminStep.errorMessage")}: {KYCReason}
+
+ }
+ if (KYCStatus === "ACCEPTED") {
+ return <>
+ {t("PersonalProfile.cantEdit")}
+
+ {t('PersonalProfile.noKYC')}
+
+ }
+
+ return (
+
+
+ );
+};
+
+export default PersonalProfile;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/components/PersonalProfile/PersonalProfile.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/components/PersonalProfile/PersonalProfile.module.css
new file mode 100644
index 0000000..4049a02
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Profile/components/PersonalProfile/PersonalProfile.module.css
@@ -0,0 +1,24 @@
+.container {
+ /*min-height: 100%;*/
+}
+.header {
+ height: 15%;
+}
+.content {
+ height: 85%;
+}
+
+.thisInput :global(.lead) {
+ width: 40%;
+}
+.thisInput :global(input) {
+ width: 60%;
+}
+
+.thisButton {
+ width: 35%;
+ background-color: var(--darkGreen);
+}
+.content img{
+ width: 25%;
+}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/Security.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/Security.js
new file mode 100644
index 0000000..f8b1019
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/Security.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import ScrollBar from "../../../../../../../../../../components/ScrollBar";
+import ActiveSessions from "./components/ActiveSessions/ActiveSessions";
+import ChangePassword from "./components/ChangePassword/ChangePassword";
+import SetTwoStepVerification from "./components/SetTwoStepVerification/SetTwoStepVerification";
+
+const Security = () => {
+ return (
+
+
+ {t("PersonalProfile.title")}
+
+ {content()}
+
+
+ {t("ActiveSessions.thisSession")}
+
+
+
+
+ {moment(current?.lastAccess * 1000).format("HH:mm:ss , jYY/jMM/jDD")}
+ {other.length > 0 ?
+
+ {t("ActiveSessions.closeOtherSessions")} : ""}
+
+
+
+
+ {current?.ipAddress}
+
+
+ {current?.agent}
+
+
+ {t("ActiveSessions.otherSession")}
+
+
+ {t("ActiveSessions.noData")}
+
+ }
+
+
+ );
+};
+
+export default ActiveSessions;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/ActiveSessions.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/ActiveSessions.module.css
new file mode 100644
index 0000000..d424cfc
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/ActiveSessions.module.css
@@ -0,0 +1,16 @@
+.container {
+ height: 52vh;
+}
+.header {
+ height: 15%;
+}
+.content {
+ height: 85%;
+}
+
+
+.thisSession {
+ background: var(--cardHeaderAlpha);
+}
+
+
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Details/Details.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Details/Details.js
new file mode 100644
index 0000000..c3287de
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Details/Details.js
@@ -0,0 +1,44 @@
+import React, {useEffect, useState} from "react"
+import classes from "./Details.module.css";
+import {browserName, deviceType, fullBrowserVersion} from "react-device-detect";
+
+
+const Details = ({details, setWrapper}) => {
+ const [close, setClose] = useState(false);
+ useEffect(() => {
+ setClose(false)
+ }, [])
+
+ const clickHandler = () => {
+ setWrapper(false)
+ setClose(true)
+ }
+
+
+ return (
+ <>{details ?
+
+ {t("ActiveSessions.title")}
+
+ {content()}
+
+ : ""}
+ setError(false)}/>
+
+
+ return
+ }
+
+
+ return (
+ :
+ }
+
+ return (
+
+ to={Routes.Profile}
+ className={({isActive}) =>
isActive ? `col-25 column jc-center ai-center ${classes.selected}` : `col-25 column jc-center ai-center`
}
>
-
+ to={Routes.Security}
+ className={({isActive}) =>
isActive ? `col-25 column jc-center ai-center ${classes.selected}` : `col-25 column jc-center ai-center`
}
>
-
+ to={Routes.Authentication}
+ className={({isActive}) =>
isActive ? `col-25 column jc-center ai-center ${classes.selected}` : `col-25 column jc-center ai-center`
}
>
-
+ to={Routes.APIKey}
+ className={({isActive}) =>
isActive ? `col-25 column jc-center ai-center ${classes.selected}` : `col-25 column jc-center ai-center`
}
>
-
);
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/SubHeader.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/SubHeader.js
index 1557ae7..441bd5d 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/SubHeader.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/SubHeader.js
@@ -1,52 +1,27 @@
-import React, {Fragment, useEffect, useState} from "react";
+import React, {useState} from "react";
import classes from "./SubHeader.module.css";
import Icon from "../../../../../../components/Icon/Icon";
-import {Route, Routes} from "react-router-dom";
+import {Route, Routes, useLocation} from "react-router-dom";
import * as RoutesName from "../../../../Routes/routes";
-import MarketHeader from "../Header/components/MarketHeader/MarketHeader";
import ProtectedRoute from "../../../../../../components/ProtectedRoute/ProtectedRoute";
-import WalletHeader from "../Header/components/WalletHeader/WalletHeader";
-import SettingsHeader from "../Header/components/SettingsHeader/SettingsHeader";
import MarketSubHeader from "./components/MarketSubHeader/MarketSubHeader";
import WalletSubHeader from "./components/WalletSubHeader/WalletSubHeader";
import SettingsSubHeader from "./components/SettingsSubHeader/SettingsSubHeader";
-import {activeOrderLayout} from "../../../../../../store/actions/global";
const SubHeader = (props) => {
-
const [expand, setExpand] = useState(false)
+ const location = useLocation()
+
- /*useEffect(() => {
- return () => {
+ const clickHandler = () => {
+ if (!(location.pathname.includes(RoutesName.SettingsRelative)) ) {
setExpand(true)
}
- }, []);*/
-
- const content = () => {
- /*if (expand) {
- return
+ {!details ? "" :
+ <>
+
+
+ );
+};
+
+export default Details;
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Details/Details.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Details/Details.module.css
new file mode 100644
index 0000000..56445f8
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Details/Details.module.css
@@ -0,0 +1,76 @@
+.container {
+ width: 30%;
+ background-color: var(--popupAlpha);
+ height: 0;
+ position: absolute;
+ top: 29%;
+ right: 7%;
+ border: none;
+
+}
+
+.container.expand {
+ animation: TopToBottom ease 0.5s forwards;
+ -webkit-animation: TopToBottom ease 0.5s forwards;
+ -moz-animation: TopToBottom ease 0.5s forwards;
+ -o-animation: TopToBottom ease 0.5s forwards;
+ -ms-animation: TopToBottom ease 0.5s forwards;
+
+ border: 0.3vh solid var(--cardBorder);
+ border-radius: 9px;
+}
+
+.container.close {
+ animation: BottomToTop ease 0.5s forwards;
+ -webkit-animation: BottomToTop ease 0.5s forwards;
+ -moz-animation: BottomToTop ease 0.5s forwards;
+ -o-animation: BottomToTop ease 0.5s forwards;
+ -ms-animation: BottomToTop ease 0.5s forwards;
+
+
+}
+
+.wrapper {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ background-color: #00000000;
+}+
+
+
+@-webkit-keyframes TopToBottom {
+ 0% {
+ height: 0%;
+ }
+ 100% {
+ height: 60%;
+ }
+}
+
+@keyframes TopToBottom {
+ 0% {
+ height: 0%;
+ }
+ 100% {
+ height: 60%;
+ }
+}
+
+@-webkit-keyframes BottomToTop {
+ 0% {
+ height: 60%;
+ }
+ 100% {
+ height: 0%;
+ }
+}
+
+@keyframes BottomToTop {
+ 0% {
+ height: 60%;
+ }
+ 100% {
+ height: 0%;
+ }
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Session/Session.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Session/Session.js
new file mode 100644
index 0000000..4ead7c0
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Session/Session.js
@@ -0,0 +1,65 @@
+import React, {useState} from "react"
+import classes from "./Session.module.css";
+import Icon from "../../../../../../../../../../../../../../components/Icon/Icon";
+import moment from "moment-jalaali";
+import {Trans, useTranslation} from "react-i18next";
+import {images} from "../../../../../../../../../../../../../../assets/images";
+import {toast} from "react-hot-toast";
+import {expireSessionById} from "js-api-client";
+
+const Session = ({list, reloadSessionsList}) => {
+ const {t} = useTranslation();
+ const [isLoading, setIsLoading] = useState(false)
+
+ const expireSession = async () => {
+ if (isLoading) return;
+ setIsLoading(true)
+ expireSessionById(list?.id)
+ .then(() => {
+ toast.success(
+ نوع
+ {deviceType}
+
+
+ نام
+ {browserName}
+
+
+
+ نسخه
+ {fullBrowserVersion}
+
+
+ }
+
+
+ );
+};
+
+export default Session;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Session/Session.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Session/Session.module.css
new file mode 100644
index 0000000..a914990
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ActiveSessions/components/Session/Session.module.css
@@ -0,0 +1,10 @@
+.striped:nth-child(even){
+ background-color: var(--tableRow);
+ -webkit-transition: background-color 0.4s;
+ -o-transition: background-color 0.4s;
+ transition: background-color 0.4s;
+}
+
+.thisLoading{
+ width: 5vw;
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ChangePassword/ChangePassword.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ChangePassword/ChangePassword.js
new file mode 100644
index 0000000..51ab3c9
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ChangePassword/ChangePassword.js
@@ -0,0 +1,211 @@
+import React, {useState} from 'react';
+import classes from "./ChangePassword.module.css";
+import {Trans, useTranslation} from "react-i18next";
+import Loading from "../../../../../../../../../../../../components/Loading/Loading";
+import Error from "../../../../../../../../../../../../components/Error/Error";
+import {requestForChangePassword} from "js-api-client";
+import {toast} from "react-hot-toast";
+import TextInput from "../../../../../../../../../../../../components/TextInput/TextInput";
+import Icon from "../../../../../../../../../../../../components/Icon/Icon";
+import Button from "../../../../../../../../../../../../components/Button/Button";
+
+const ChangePassword = () => {
+ const {t} = useTranslation();
+ const [error, setError] = useState(false);
+ const [isLoading, setLoading] = useState(false);
+ const [userInputs, setInputs] = useState({
+ newPassword: {value: "", error: []},
+ confirmation: {value: "", error: []},
+ currentPassword: {value: "", error: []},
+ });
+ const [isInputVisible, setIsInputVisible] = useState({
+ newPassword: false,
+ confirmation: false,
+ currentPassword: false,
+ });
+
+ const inputHandler = (e) => {
+ let errorMessage = []
+ if (typeof e.target.dataset.min !== undefined && e.target.value.length < e.target.dataset.min) {
+ errorMessage.push(
+
+
+
+
+ {moment(list?.lastAccess * 1000).format("HH:mm:ss , jYY/jMM/jDD")}
+
+ {isLoading ?
+ 
+ :
+ t("ActiveSessions.closeSession")}
+
+
+
+
+
+ {list?.ipAddress}
+
+
+ {list?.agent}
+
+
+
+ );
+};
+
+export default ChangePassword;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ChangePassword/ChangePassword.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ChangePassword/ChangePassword.module.css
new file mode 100644
index 0000000..d8ab585
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/ChangePassword/ChangePassword.module.css
@@ -0,0 +1,27 @@
+.container {
+ height: 52vh;
+}
+.header {
+ height: 15%;
+}
+.content {
+ height: 85%;
+}
+.thisButton {
+ width: 25%;
+ background-color: var(--darkGreen);
+}
+.passwordInput :global(.lead) {
+ width: 50%;
+ cursor: pointer;
+}
+.passwordInput :global(.after) {
+ width: 10%;
+ cursor: pointer;
+}
+.passwordInput :global(input) {
+ width: 40% !important;
+}
+
+
+
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/SetTwoStepVerification.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/SetTwoStepVerification.js
new file mode 100644
index 0000000..5b5fc52
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/SetTwoStepVerification.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import classes from './SetTwoStepVerification.module.css'
+import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
+import {useGetUserOtpStatus} from "../../../../../../../../../../../../queries";
+import Loading from "../../../../../../../../../../../../components/Loading/Loading";
+import Error from "../../../../../../../../../../../../components/Error/Error";
+import DeActiveOTP from "./components/DeActiveOTP";
+import ActivateOTP from "./components/ActivateOTP";
+
+const SetTwoStepVerification = () => {
+
+ const {t} = useTranslation();
+ const username = useSelector(state => state.auth.username);
+ const {data: otp, isLoading, error,refetch : refetchOtp} = useGetUserOtpStatus(username)
+
+ const content = () => {
+ if (isLoading) return
+
+ {t("ChangePassword.title")}
+
+ {content()}
+
+
+
+ );
+};
+
+export default SetTwoStepVerification;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/SetTwoStepVerification.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/SetTwoStepVerification.module.css
new file mode 100644
index 0000000..6800bdc
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/SetTwoStepVerification.module.css
@@ -0,0 +1,36 @@
+.container {
+ height: 62vh;
+}
+.header {
+ height: 13%;
+}
+.content {
+ height: 87%;
+}
+.thisLoading{
+ width: 5vw;
+}
+
+.thisButton {
+ width: 25%;
+ background-color: var(--darkGreen);
+}
+.submit{
+ width: 20%;
+}
+.disableOtp{
+ background-color: var(--darkRed);
+ width: 25%;
+}
+
+.thisInput :global(.lead) {
+ width: 35%;
+}
+.thisInput :global(input) {
+ width: 75% !important;
+ letter-spacing: 1rem;
+}
+/*.thisInput :global(input) {
+ width: 85% !important;
+}*/
+
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/components/ActivateOTP.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/components/ActivateOTP.js
new file mode 100644
index 0000000..2610410
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/components/ActivateOTP.js
@@ -0,0 +1,108 @@
+import React, {useState} from 'react';
+import {useTranslation} from "react-i18next";
+import {requestForActivateOTP, sendInitialCodeToActivateOTP} from "js-api-client";
+import {toast} from "react-hot-toast";
+import Loading from "../../../../../../../../../../../../../components/Loading/Loading";
+import QRCode from "react-qr-code";
+import TextInput from "../../../../../../../../../../../../../components/TextInput/TextInput";
+import Button from "../../../../../../../../../../../../../components/Button/Button";
+import {images} from "../../../../../../../../../../../../../assets/images";
+import classes from "../SetTwoStepVerification.module.css";
+
+const ActivateOTP = ({refetchOtp}) => {
+
+ const {t} = useTranslation();
+
+ const [error, setError] = useState(false);
+ const [loading, setLoading] = useState(false);
+ const [isLoading, setIsLoading] = useState(false);
+ const [reqOTP, setReqOTP] = useState();
+ const [alert, setAlert] = useState([]);
+ const [initialCode, setInitialCode] = useState("");
+
+ const OTPInputHandler = (value) => {
+ const userInput = value.replace(/[^0-9]+/g, "").slice(0, 6)
+ setInitialCode(userInput)
+ }
+
+
+ const sendReqActivateOTP = () => {
+ if (isLoading) return
+ setError(false)
+ setIsLoading(true)
+ requestForActivateOTP()
+ .then((res) => {
+ setReqOTP(res.data)
+ })
+ .catch(() => {
+ setError(true)
+ })
+ .finally(() => {
+ setIsLoading(false)
+ })
+ }
+ const submitActivation = async (e) => {
+ e.preventDefault();
+ if (initialCode.length !== 6) {
+ return setAlert([t("SetTwoStepVerification.initialCodeMin")])
+ }
+ setAlert([])
+ setLoading(true)
+ sendInitialCodeToActivateOTP(reqOTP.secret, initialCode)
+ .then(() => {
+ refetchOtp()
+ toast.success(t("SetTwoStepVerification.success"));
+ })
+ .catch(() => {
+ setAlert([t("SetTwoStepVerification.initialCodeError")])
+ })
+ .finally(() => {
+ setLoading(false)
+ });
+ }
+
+ if (loading) return
+
+ {otp ? t("SetTwoStepVerification.!title") : t("SetTwoStepVerification.title")}
+
+ {content()}
+
+
+ {t("SetTwoStepVerification.QRdescription")}
+
+ }
+
+ return (
+
+ {t("SetTwoStepVerification.description")}
+
+ );
+};
+
+export default ActivateOTP;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/components/DeActiveOTP.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/components/DeActiveOTP.js
new file mode 100644
index 0000000..292f824
--- /dev/null
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Settings/components/Security/components/SetTwoStepVerification/components/DeActiveOTP.js
@@ -0,0 +1,52 @@
+import React, {useState} from 'react';
+import classes from "../SetTwoStepVerification.module.css";
+import {toast} from "react-hot-toast";
+import {useTranslation} from "react-i18next";
+import {images} from "../../../../../../../../../../../../../assets/images";
+import Button from "../../../../../../../../../../../../../components/Button/Button";
+import {requestForDeActiveOTP} from "js-api-client";
+
+const DeActiveOTP = ({refetchOtp}) => {
+
+ const {t} = useTranslation();
+ const [isLoading, setIsLoading] = useState(false);
+ const [error, setError] = useState(false);
+
+ const disableOTPHandler = () => {
+ setIsLoading(true)
+ requestForDeActiveOTP()
+ .then(() => {
+ refetchOtp()
+ toast.success(t("SetTwoStepVerification.error"));
+ })
+ .catch(() => {
+ setError(true)
+ })
+ .finally(() => {
+ setIsLoading(false)
+ })
+ }
+ return (
+
+ : t("SetTwoStepVerification.active")}
+ onClick={sendReqActivateOTP}
+ />
+
+ {error ? t("SetTwoStepVerification.serverError") : ""}
+
+
+
+
+ );
+};
+
+export default DeActiveOTP;
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/Wallet.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/Wallet.js
index a95a357..110a3e7 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/Wallet.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/Wallet.js
@@ -26,7 +26,7 @@ const Wallet = () => {
}
return (
-
+ 
+
+ {t("SetTwoStepVerification.isActive")}
+
+ :
+ t("SetTwoStepVerification.deActive")}
+ onClick={disableOTPHandler}
+ />
+ {error ?
+ {t("SetTwoStepVerification.serverError")}
+ : ""}
+
+
+ dispatch(activeActionSheet({subMenu: true}))}>
- امنیت
+
);
};
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/NavMenu/components/SettingsNavMenu/SettingsNavMenu.js b/src/main/Mobile/Pages/UserPanel/Secttions/NavMenu/components/SettingsNavMenu/SettingsNavMenu.js
index 589c33e..7d3ae2b 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/NavMenu/components/SettingsNavMenu/SettingsNavMenu.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/NavMenu/components/SettingsNavMenu/SettingsNavMenu.js
@@ -3,48 +3,52 @@ import classes from "../../NavMenu.module.css";
import {NavLink} from "react-router-dom";
import * as Routes from "../../../../../../Routes/routes";
import Icon from "../../../../../../../../components/Icon/Icon";
+import {useTranslation} from "react-i18next";
const SettingsNavMenu = () => {
+
+ const {t} = useTranslation();
+
return (
{content()}
);
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/SettingsHeader/SettingsHeader.js b/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/SettingsHeader/SettingsHeader.js
index c638a9b..80cacd6 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/SettingsHeader/SettingsHeader.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/SettingsHeader/SettingsHeader.js
@@ -2,16 +2,26 @@ import React from 'react';
import Icon from "../../../../../../../../components/Icon/Icon";
import {useDispatch} from "react-redux";
import {activeActionSheet} from "../../../../../../../../store/actions/global";
+import {useLocation} from "react-router-dom";
+import {useTranslation} from "react-i18next";
+import * as RoutesName from "../../../../../../Routes/routes";
const SettingsHeader = () => {
+ const {t} = useTranslation()
const dispatch = useDispatch();
+ const location = useLocation()
+ const clickHandler = () => {
+ if (!(location.pathname.includes(RoutesName.SettingsRelative)) ) {
+ dispatch(activeActionSheet({subMenu: true}))
+ }
+ }
return (
<>
- dispatch(activeActionSheet({subMenu: true}))}>
- امنیت
+ clickHandler()}>
+ {t("routes." + location.pathname)}
dispatch(activeActionSheet({menu: true}))}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Menu/Menu.js b/src/main/Mobile/Pages/UserPanel/Secttions/Menu/Menu.js
index b66ac25..8688efd 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Menu/Menu.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Menu/Menu.js
@@ -6,6 +6,7 @@ import * as RoutesName from "../../../../Routes/routes";
import {activeActionSheet} from "../../../../../../store/actions/global";
import {useDispatch} from "react-redux";
import {useTranslation} from "react-i18next";
+import {Profile} from "../../../../Routes/routes";
const Menu = () => {
@@ -44,15 +45,15 @@ const Menu = () => {
isActive ? `${classes.selected} width-50 row jc-between ai-center py-1` : "width-50 row jc-between ai-center py-1"
}
>
*/}
+
-
-
-
-
-
-
- setExpand(false)}/>
-
-
- }*/
- /* if (!expand) {
- return
- setExpand(true)}/>
-
-
-
-
- }*/
-
- return
+ }
+ return (
+
diff --git a/src/main/Mobile/Routes/routes.js b/src/main/Mobile/Routes/routes.js
index 637068a..fc6571c 100644
--- a/src/main/Mobile/Routes/routes.js
+++ b/src/main/Mobile/Routes/routes.js
@@ -27,7 +27,8 @@ export const Personalization = "/panel/settings/personalization";
export const PersonalizationRelative = "personalization";
export const Authentication = "/panel/settings/authentication";
export const AuthenticationRelative = "/authentication";
-
+export const APIKey = "/panel/settings/api-key";
+export const APIKeyRelative = "/api-key";
export const Overview = "/panel/market/overview";
{expand &&
{
}>
setExpand(false)}/>
}
-
- setExpand(true)}/>
+ clickHandler()}/>
- }
-
-
- return (
- content()
);
-
};
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/SettingsSubHeader/SettingsSubHeader.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/SettingsSubHeader/SettingsSubHeader.js
index 3b7b35b..d3f8abf 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/SettingsSubHeader/SettingsSubHeader.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/SettingsSubHeader/SettingsSubHeader.js
@@ -3,7 +3,7 @@ import React from 'react';
const SettingsSubHeader = () => {
return (
- settings
+
);
};
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
index ebf89da..9d47c1e 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
@@ -21,8 +21,6 @@ const WalletListItem = ({assetName, showZero}) => {
if (showZero && free === 0) return <>
- console.log("asset: ", assetName)
-
return (