diff --git a/docker-compose.yml b/docker-compose.yml
index e92b604..98d231c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
- REGISTER_EMAIL_ADDRESS=$REGISTER_EMAIL_ADDRESS
- REFERENCE_FIAT_CURRENCY=$WEB_APP_REFERENCE_FIAT_CURRENCY
- CALENDAR_TYPE=$WEB_APP_CALENDAR_TYPE
+ - REDIRECT_URL=$WEB_APP_REDIRECT_URL
networks:
- default
deploy:
diff --git a/env-map.js b/env-map.js
index 3bffcb1..2f4a4e6 100644
--- a/env-map.js
+++ b/env-map.js
@@ -13,5 +13,6 @@ window.env = {
REACT_APP_SYSTEM_EMAIL_ADDRESS : "$REGISTER_EMAIL_ADDRESS",
REACT_APP_REFERENCE_FIAT_CURRENCY : "$REFERENCE_FIAT_CURRENCY",
REACT_APP_CALENDAR_TYPE : "$CALENDAR_TYPE",
+ REACT_APP_REDIRECT_URL : "$REDIRECT_URL",
}
\ No newline at end of file
diff --git a/src/components/TextInput/TextInput.js b/src/components/TextInput/TextInput.js
index 87227d5..a70cb79 100644
--- a/src/components/TextInput/TextInput.js
+++ b/src/components/TextInput/TextInput.js
@@ -46,7 +46,7 @@ const TextInput = (props) => {
iconName={`${classes.iconInfo} text-white fs-0-6 flex`}
customClass="hint-icon"
/>
-
+
{ alerts.map((alert , index) => {alert}) }
diff --git a/src/components/TextInput/TextInput.module.css b/src/components/TextInput/TextInput.module.css
index 0b7b0d6..592cf9d 100644
--- a/src/components/TextInput/TextInput.module.css
+++ b/src/components/TextInput/TextInput.module.css
@@ -94,7 +94,7 @@
justify-content: center;
}
.alert {
- font-size: 0.7vw;
+ /*font-size: 0.7vw;*/
color: var(--red);
line-height:2.8vh;
}
diff --git a/src/main/Browser/Browser.js b/src/main/Browser/Browser.js
index 7cc3358..2981b76 100644
--- a/src/main/Browser/Browser.js
+++ b/src/main/Browser/Browser.js
@@ -9,12 +9,16 @@ import useQuery from "../../Hooks/useQuery";
import useInterval from "../../Hooks/useInterval";
import {setLastPriceInitiate} from "../../store/actions/exchange";
import FullWidthError from "../../components/FullWidthError/FullWidthError";
+import {useNavigate} from "react-router-dom";
const Browser = () => {
const dispatch = useDispatch();
+ const navigate = useNavigate();
+
const query = useQuery();
+
const isDark = useSelector((state) => state.global.isDark)
const isLoading = useSelector((state) => state.global.isLoading)
const hasError = useSelector((state) => state.global.hasError)
@@ -39,6 +43,18 @@ const Browser = () => {
}, []);
+ const redirectURL = window.env.REACT_APP_REDIRECT_URL
+
+ const redirectFunc = () => {
+ window.location.replace(redirectURL);
+ };
+
+ useEffect(()=>{
+ redirectFunc()
+ }, [])
+
+
+
useInterval(() => {
dispatch(setUserAccountInfoInitiate());
}, isLogin ? 3000 : null)
@@ -81,8 +97,16 @@ const Browser = () => {
if (hasError) {
return
}
+
+
+
+
return (
- Open in Mobile ...
+
+
+ Open in Mobile ...
+
+
);
};
diff --git a/src/main/Mobile/Pages/Login/Login.js b/src/main/Mobile/Pages/Login/Login.js
index 5195a08..b965780 100644
--- a/src/main/Mobile/Pages/Login/Login.js
+++ b/src/main/Mobile/Pages/Login/Login.js
@@ -27,15 +27,15 @@ const Login = () => {
return (
-
+ {/*
{t('login.description')}
-
-
+
*/}
+
diff --git a/src/main/Mobile/Pages/Login/Login.module.css b/src/main/Mobile/Pages/Login/Login.module.css
index a4de19b..ad4d5a2 100644
--- a/src/main/Mobile/Pages/Login/Login.module.css
+++ b/src/main/Mobile/Pages/Login/Login.module.css
@@ -48,8 +48,8 @@
width: 75%;
}
-.loginInput{
- width: 75%;
+.loginInput {
+ width: 85%;
margin-bottom: 1vh;
}
.loginInput > div{
@@ -84,7 +84,7 @@
}
.thisLoading{
- width: 5vw;
+ width: 9vw;
}
.loginInput.otpInput :global(input){
diff --git a/src/main/Mobile/Pages/Login/components/ForgetPassword/ForgetPassword.js b/src/main/Mobile/Pages/Login/components/ForgetPassword/ForgetPassword.js
index 053f088..5ee46d5 100644
--- a/src/main/Mobile/Pages/Login/components/ForgetPassword/ForgetPassword.js
+++ b/src/main/Mobile/Pages/Login/components/ForgetPassword/ForgetPassword.js
@@ -91,7 +91,7 @@ const ForgetPassword = ({returnFunc}) => {
if (captcha.image.value === undefined ) {
return
{t('captchaAnswer')}
}
- return
+ return

}
diff --git a/src/main/Mobile/Pages/Login/components/LoginLoading/LoginFormLoading.js b/src/main/Mobile/Pages/Login/components/LoginLoading/LoginFormLoading.js
index 8d5b9f8..ab0d0c2 100644
--- a/src/main/Mobile/Pages/Login/components/LoginLoading/LoginFormLoading.js
+++ b/src/main/Mobile/Pages/Login/components/LoginLoading/LoginFormLoading.js
@@ -4,7 +4,7 @@ import {connect} from "react-redux";
const LoginFormLoading = ({isDark}) => {
return
-

+
}