diff --git a/src/components/ImmediateCreditsStages/AcceptStage.js b/src/components/ImmediateCreditsStages/AcceptStage.js index 5fa364b..f664f50 100644 --- a/src/components/ImmediateCreditsStages/AcceptStage.js +++ b/src/components/ImmediateCreditsStages/AcceptStage.js @@ -1,13 +1,13 @@ // IMPORT MODULES -import React, { useState, useContext } from "react"; -import { LanguageContext } from "../../backend/LanguageContext"; -import { UserContext } from "../../backend/UserContext"; -import { useForm } from "react-hook-form"; -import { z } from "zod"; -import { zodResolver } from "@hookform/resolvers/zod"; +import React, { useState, useContext } from 'react'; +import { LanguageContext } from '../../backend/LanguageContext'; +import { UserContext } from '../../backend/UserContext'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; +import { zodResolver } from '@hookform/resolvers/zod'; // IMPORT IMAGES -import next from "../../icons/next.svg"; -import next_reverse from "../../icons/next-reverse.svg"; +import next from '../../icons/next.svg'; +import next_reverse from '../../icons/next-reverse.svg'; // import arrow from "../../icons/arrow.svg"; const schema = z.object({ @@ -30,7 +30,7 @@ const AcceptStage = ({ userDataRes, }) => { const { locale } = useContext(LanguageContext); - const userToken = localStorage.getItem("userToken"); + const userToken = localStorage.getItem('userToken'); const { user } = useContext(UserContext); const handleCardDetails = (e) => { @@ -47,23 +47,20 @@ const AcceptStage = ({ } = useForm({ resolver: zodResolver(schema), defaultValues: { - amount: recepientAmount ? recepientAmount : "Loading", - duration: creditDuration ? creditDuration : "loading", + amount: recepientAmount ? recepientAmount : 'Loading', + duration: creditDuration ? creditDuration : 'loading', }, }); const sendCode = async () => { try { - const response = await fetch( - "https://shahsyotag.halkbank.gov.tm/sendOTP", - { - method: "POST", - headers: { "Content-Type": "aplication/json" }, - body: JSON.stringify({ - phone_number: user.mobile_phone, - }), - } - ); + const response = await fetch('https://shahsyotag.halkbank.gov.tm/sendOTP', { + method: 'POST', + headers: { 'Content-Type': 'aplication/json' }, + body: JSON.stringify({ + phone_number: user.mobile_phone, + }), + }); if (!response.ok) { throw new Error(`HTTP error! Status: ${response.status}`); @@ -85,23 +82,19 @@ const AcceptStage = ({

Error...

- @@ -112,7 +105,7 @@ const AcceptStage = ({ if (isLoading) { return ( -
+

Loading...

); @@ -122,55 +115,50 @@ const AcceptStage = ({

- {locale === "TKM" - ? "Karzyň kalkulýatory" - : locale === "РУС" - ? "Подтвердите данные" - : locale === "ENG" - ? "Loan calculator" - : "Karzyň kalkulýatory"} + {locale === 'TKM' + ? 'Maglumatlary tassyklaň' + : locale === 'РУС' + ? 'Подтвердите данные' + : locale === 'ENG' + ? 'Confirm your details' + : 'Maglumatlary tassyklaň'}

- + {errors.amount && {errors.amount.message}}
- + {errors.duration && {errors.duration.message}}
setStage(12)}> - Оформить карту + {locale === 'TKM' + ? 'Kartyňyz ýok bolsa, täze karty üçin ýüz tutuň' + : locale === 'РУС' + ? 'Оформите новую карту, если она у вас отсувствует' + : locale === 'ENG' + ? 'Apply for a new card if you do not have one' + : 'Kartyňyz ýok bolsa, täze karty üçin ýüz tutuň'} {/* {errors.code && {errors.code.message}} */}
- @@ -213,17 +203,16 @@ const AcceptStage = ({ onClick={() => { onSubmit(); setStage(9); - }} - > + }}>

- {locale === "TKM" - ? "Dowam et" - : locale === "РУС" - ? "Подтвердить " - : locale === "ENG" - ? "Proceed" - : "Dowam et"} + {locale === 'TKM' + ? 'Dowam et' + : locale === 'РУС' + ? 'Подтвердить ' + : locale === 'ENG' + ? 'Proceed' + : 'Dowam et'}

logout diff --git a/src/components/ImmediateCreditsStages/BorrowerInfo.js b/src/components/ImmediateCreditsStages/BorrowerInfo.js index d76c42e..4134c5d 100644 --- a/src/components/ImmediateCreditsStages/BorrowerInfo.js +++ b/src/components/ImmediateCreditsStages/BorrowerInfo.js @@ -74,12 +74,12 @@ const BorrowerInfo = ({

{locale === 'TKM' - ? 'Karzyň kalkulýatory' + ? 'Görkezilen maglumatlary tassyklaň, eger-de görkezilen maglumatlar nädogry bolsa ýa-da doldurylmadyk meýdançalar bar bolsa, bank bilen habarlaşyň!' : locale === 'РУС' - ? 'Подтвердите данные' + ? 'Подтвердите указанные данные, если указанные данные неверны или есть пустые поля, обратитесь в банк!' : locale === 'ENG' - ? 'Loan calculator' - : 'Karzyň kalkulýatory'} + ? 'Confirm the specified data, if the specified data is incorrect or there are blank fields, contact the bank!' + : 'Görkezilen maglumatlary tassyklaň, eger-de görkezilen maglumatlar nädogry bolsa ýa-da doldurylmadyk meýdançalar bar bolsa, bank bilen habarlaşyň!'}

@@ -113,12 +113,12 @@ const BorrowerInfo = ({
{/* {errors.surname && {errors.surname.message}} */} @@ -126,25 +126,26 @@ const BorrowerInfo = ({
{/* {errors.surname && {errors.surname.message}} */}
+
{errors.passportSerial && {errors.passportSerial.message}} @@ -152,12 +153,12 @@ const BorrowerInfo = ({
@@ -184,12 +185,12 @@ const BorrowerInfo = ({
@@ -217,16 +218,18 @@ const BorrowerInfo = ({
@@ -234,16 +237,18 @@ const BorrowerInfo = ({
@@ -269,6 +274,9 @@ const BorrowerInfo = ({
-
+

{locale === 'TKM' ? 'Zamunçylygyň görnüşini saýlan' @@ -310,7 +310,11 @@ const BorrowerStage = ({

-

Максимальная сумма онлайн потребительского кредита составляет 60000 манат

+

+ {/*

Максимальная сумма онлайн потребительского кредита составляет 60000 манат

*/}
@@ -335,7 +297,10 @@ const CalculateStage = ({ : 'UgrPul ýygymyatmak'} : -
{(((inputValue * (bet / 100)) / 365) * 30).toFixed(2)} TMT
+
+ {creditDuration === 0 ? 0 : (((inputValue * (bet / 100)) / 365) * 30).toFixed(2)} + TMT +
@@ -348,7 +313,7 @@ const CalculateStage = ({ : 'Karzyň esasy bergisiniň töleg möçberi'} :
-
{(inputValue / (radio * 12)).toFixed(2)} TMT
+
{creditDuration === 0 ? 0 : (inputValue / (radio * 12)).toFixed(2)} TMT
@@ -362,7 +327,7 @@ const CalculateStage = ({ : 'Karz almak üçin bolmaly aýlyk zähmet haky'} : -
{monthlyPayment * 2} TMT
+
{creditDuration === 0 ? 0 : monthlyPayment * 2} TMT
diff --git a/src/components/ImmediateCreditsStages/CardRegistration.js b/src/components/ImmediateCreditsStages/CardRegistration.js index bbbf6b0..d767f7f 100644 --- a/src/components/ImmediateCreditsStages/CardRegistration.js +++ b/src/components/ImmediateCreditsStages/CardRegistration.js @@ -158,7 +158,7 @@ const CardRegistration = ({ borrowerData, setStage, setPaymentLink, setPaymentDe if (isLoading) { return ( -
+

Loading...

); diff --git a/src/components/ImmediateCreditsStages/GuaranterStage.js b/src/components/ImmediateCreditsStages/GuaranterStage.js index a81c9af..5447d3a 100644 --- a/src/components/ImmediateCreditsStages/GuaranterStage.js +++ b/src/components/ImmediateCreditsStages/GuaranterStage.js @@ -126,7 +126,7 @@ const GuaranterStage = ({ if (isLoading) { return ( -
+

Loading...

); diff --git a/src/components/ImmediateCreditsStages/LoanAccepted.js b/src/components/ImmediateCreditsStages/LoanAccepted.js index e5d719f..e6c7ae9 100644 --- a/src/components/ImmediateCreditsStages/LoanAccepted.js +++ b/src/components/ImmediateCreditsStages/LoanAccepted.js @@ -11,12 +11,12 @@ const LoanAccepted = ({ setStage, setModalOpen, acceptedMessage }) => {

{locale === 'TKM' - ? 'Karzyň kalkulýatory' + ? 'Arzaňyz kabul edildi' : locale === 'РУС' - ? acceptedMessage + ? 'Ваша заявка принята' : locale === 'ENG' - ? 'Loan calculator' - : 'Karzyň kalkulýatory'} + ? 'Your application is accepted' + : 'Arzaňyz kabul edildi'}