Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opex",
"version": "v1.0.4-beta.15",
"version": "v1.0.5-beta.15",
"homepage": "",
"private": true,
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion public/assets/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
"maxWithdraw": "Your daily withdrawal limit",
"maxMonthWithdraw": "Your monthly withdrawal limit",
"withdrawWarn": "Please note! Incorrect entry of address can result in loss of capital.",
"withdrawReqSubmit": "withdraw withdrawal request",
"withdrawReqSubmit": "withdraw request",
"destAddress": "Receive Address",
"reqAmount": "Your Receipt",
"network": "Network",
Expand Down
11 changes: 2 additions & 9 deletions src/components/FullWidthError/FullWidthError.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,8 @@ const FullWidthError = () => {
}

return (
<div className={`container ${classes.container} move-image flex jc-center ai-center text-red`} style={{backgroundImage: `url("${images.spaceStar}")`}}>
<div className={`column jc-around ai-center card-border py-1`} style={{
position: 'fixed',
top: '27.5%',
left: '37.5%',
width: '25%',
height: '45%',
backgroundColor: 'var(--cardBodyAlpha)',
}}>
<div className={`${classes.container} width-100 move-image flex jc-center ai-center text-red`} style={{backgroundImage: `url("${images.spaceStar}")`}}>
<div className={`column jc-around ai-center card-border py-1 ${classes.content}`}>
<img src={images.reject} alt="error" className={`img-lg-plus floating`}/>
<span>{t("errorPage.errorText")}</span>
<Button
Expand Down
4 changes: 3 additions & 1 deletion src/components/FullWidthLoading/FullWidthError.module.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.container{
direction: ltr;
height: 100vh;
top: 0;
bottom: 0;
position: absolute;
background-color: var(--cardBody);
}
.dash {
Expand Down
2 changes: 1 addition & 1 deletion src/components/FullWidthLoading/FullWidthLoading.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import classes from './FullWidthError.module.css'

const FullWidthLoading = () => {
return (
<div className={`container ${classes.container} flex jc-center ai-center`}>
<div className={`${classes.container} width-100 flex jc-center ai-center`}>
<div className="row ai-center jc-center">
<div className={`${classes.dash} ${classes.one}`} />
<div className={`${classes.dash} ${classes.two}`} />
Expand Down
5 changes: 2 additions & 3 deletions src/components/Popup/Popup.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.container {
position: fixed;
position: absolute;
top: 11vh;
width: 30%;
height: 40vh;
height: 50vh;
background-color: var(--popupAlpha);
z-index: 3;
box-shadow: -1px 5px 8px -2px #101010ad;
Expand Down Expand Up @@ -30,7 +30,6 @@

.thisButton {
width: 30%;
height: 3.5vh !important;
}

.walletButton {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Popup/PopupAddress/PopupAddress.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const PopupAddress = ({currency, network}) => {

return (
<>
<span className={`my-1`}>
<span className={`mt-3 mb-2`}>
<QRCode
value={address.address}
bgColor="var(--cardBody)"
Expand Down
5 changes: 2 additions & 3 deletions src/components/TextInput/TextInput.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,13 @@
border: none;
/*direction: ltr;*/
text-align: center;
font-family: iranyekan, serif;
background: none;
color: var(--textColor) !important;
}

:global(.ltr) .inputGroup input {
/*:global(.ltr) .inputGroup input {
font-family: 'Poppins', 'Roboto', sans-serif !important;
}
}*/

.inputGroup .lead {
border-radius: 0 4px 4px 0;
Expand Down
2 changes: 2 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -2580,10 +2580,12 @@ h6 {

input {
direction: rtl;
font-family: "IRANYekan", sans-serif;
}

.ltr input {
direction: ltr;
font-family: 'Poppins', 'Roboto', sans-serif !important;
}

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ const RegisterForm = () => {
data-name="password"
customClass={`${classes.loginInput} ${classes.passwordInput}`}
ltr={true}
autocomplete="new-password"
autoComplete="new-password"
value={userData.password.value}
onchange={(e) => inputHandler(e)}
alerts={userData.password.error}
Expand All @@ -268,7 +268,7 @@ const RegisterForm = () => {
data-name="confirmPassword"
customClass={`${classes.loginInput} ${classes.passwordInput}`}
ltr={true}
autocomplete="new-password"
autoComplete="new-password"
value={userData.confirmPassword.value}
onchange={(e) => inputHandler(e)}
alerts={userData.confirmPassword.error}
Expand Down
4 changes: 3 additions & 1 deletion src/main/Browser/Pages/User/User.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
background-repeat: repeat;
background-position: center center;
background-size: 600px 1200px;
top: 0;
bottom: 0;
position: absolute;
}

.content{

top: 20%;
left: 32.5%;
width: 35%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const ForgetPassword = () => {
onClick={() => setIsInputVisible({ ...isInputVisible, newPassword: !isInputVisible.newPassword })}
/>
}
autocomplete="new-password"
autoComplete="new-password"
type={isInputVisible.newPassword ? "text" : "password"}
value={changePassword.newPassword.value}
data-name="newPassword"
Expand All @@ -126,7 +126,7 @@ const ForgetPassword = () => {
onClick={() => setIsInputVisible({ ...isInputVisible, confirmation: !isInputVisible.confirmation })}
/>
}
autocomplete="off"
autoComplete="new-password"
type={isInputVisible.confirmation ? "text" : "password"}
value={changePassword.confirmation.value}
data-name="confirmation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
background: var(--orangeAlpha) !important;
}
.tbody{
line-height: 3.7vh;
line-height: 4.7vh;
}
.thead{
position: sticky;
top: 0;
z-index: 1;
font-weight: normal;
background-color: var(--tableHeader);
line-height: 3.7vh;
line-height: 4.7vh;
}
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const ChangePassword = () => {
data-name="newPassword"
data-type="input"
data-min={8}
autocomplete="new-password"
autoComplete="new-password"
onchange={(e) => inputHandler(e)}
alerts={userInputs.newPassword.error}
/>
Expand All @@ -189,7 +189,7 @@ const ChangePassword = () => {
data-name="confirmation"
data-type="input"
data-min={8}
autocomplete="off"
autoComplete="new-password"
onchange={(e) => inputHandler(e)}
alerts={userInputs.confirmation.error}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
height: 4.5vh;
border: none;
border-radius: 7px;
font-family: "IRANYekan";
font-size: 0.8vw;
color: #f2f2f2;
bottom: 0;
Expand Down