Skip to content

Commit

Permalink
Merge pull request #59 from Telios-org/hotfix
Browse files Browse the repository at this point in the history 
Hotfix
  • Loading branch information
@hexadecible
hexadecible authored Apr 12, 2022
2 parents f681b1c + ed2cd22 commit 5e39171
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 75 deletions.
137 changes: 68 additions & 69 deletions app/login_window/components/Register.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ class Register extends Component<Props, State> {
masterpass: '',
confirmpass: '',
recoveryemail: '',
checkbox: [],
betacode: ''
checkbox: []
// betacode: ''
},
step: 0,
step: 1,
formError: {},
formSuccess: {},
canSubmit: false,
Expand All @@ -115,72 +115,72 @@ class Register extends Component<Props, State> {
this.onChangeRecoveryEmail = this.onChangeRecoveryEmail.bind(this);
this.onChangePass = this.onChangePass.bind(this);
this.onChangeConfirmPass = this.onChangeConfirmPass.bind(this);
this.onChangeBetaCode = this.onChangeBetaCode.bind(this);
// this.onChangeBetaCode = this.onChangeBetaCode.bind(this);
this.handleNextStep = this.handleNextStep.bind(this);
this.isNextStepDisabled = this.isNextStepDisabled.bind(this);
this.passwordStrengthlass = this.passwordStrengthlass.bind(this);
this.showMainWindow = this.showMainWindow.bind(this);
this.togglePassword = this.togglePassword.bind(this);
}

onChangeBetaCode = debounce(async input => {
// eslint-disable-next-line prefer-const
let { formError, formSuccess, betaCheckLoading, nextStepDisabled } = {
...this.state
};

const options = {
url: `${requestBase}/account/beta/verify`,
method: 'post',
headers: {
'Content-Type': 'application/json'
},
data: {
vcode: input
}
};

if (!input) {
betaCheckLoading = false;
delete formSuccess.betacode;
formError.betacode = i18n.t('form.betaCodeRequired');
this.setState({
betaCheckLoading,
formSuccess,
formError,
nextStepDisabled: true
});
return;
}

delete formSuccess.betacode;
delete formError.betacode;
betaCheckLoading = true;
this.setState({ betaCheckLoading, formSuccess, formError });

try {
const result = await axios(options);
betaCheckLoading = false;
formSuccess.betacode = true;
nextStepDisabled = false;
} catch (error) {
betaCheckLoading = false;
formError.betacode = i18n.t('register.betaCodeNotValid');

if (error.response && error.response.status !== 400) {
formError.betacode = error;
}
// onChangeBetaCode = debounce(async input => {
// // eslint-disable-next-line prefer-const
// let { formError, formSuccess, betaCheckLoading, nextStepDisabled } = {
// ...this.state
// };

// const options = {
// url: `${requestBase}/account/beta/verify`,
// method: 'post',
// headers: {
// 'Content-Type': 'application/json'
// },
// data: {
// vcode: input
// }
// };

// if (!input) {
// betaCheckLoading = false;
// delete formSuccess.betacode;
// formError.betacode = i18n.t('form.betaCodeRequired');
// this.setState({
// betaCheckLoading,
// formSuccess,
// formError,
// nextStepDisabled: true
// });
// return;
// }

nextStepDisabled = true;
}
// delete formSuccess.betacode;
// delete formError.betacode;
// betaCheckLoading = true;
// this.setState({ betaCheckLoading, formSuccess, formError });

// try {
// const result = await axios(options);
// betaCheckLoading = false;
// formSuccess.betacode = true;
// nextStepDisabled = false;
// } catch (error) {
// betaCheckLoading = false;
// formError.betacode = i18n.t('register.betaCodeNotValid');

// if (error.response && error.response.status !== 400) {
// formError.betacode = error;
// }

// nextStepDisabled = true;
// }

this.setState({
betaCheckLoading,
formSuccess,
formError,
nextStepDisabled
});
}, 500);
// this.setState({
// betaCheckLoading,
// formSuccess,
// formError,
// nextStepDisabled
// });
// }, 500);

// onChangeBetaCode = formValue => {
// const state = { ...this.state };
Expand Down Expand Up @@ -267,7 +267,7 @@ class Register extends Component<Props, State> {
const errors = Object.keys(formError).length;

if (
formValue.betacode &&
// formValue.betacode &&
formValue.email &&
formValue.masterpass &&
formValue.confirmpass &&
Expand All @@ -281,8 +281,8 @@ class Register extends Component<Props, State> {
const acct = await Login.createAccount({
password: formValue.masterpass,
email: email.toLowerCase(),
recoveryEmail: formValue.recoveryemail.toLowerCase(),
vcode: formValue.betacode
recoveryEmail: formValue.recoveryemail.toLowerCase()
// vcode: formValue.betacode
});

console.log(acct);
Expand Down Expand Up @@ -354,7 +354,7 @@ class Register extends Component<Props, State> {
const errors = Object.keys(formError).length;

if (
formValue.betacode &&
// formValue.betacode &&
formValue.email &&
formValue.masterpass &&
formValue.checkbox.includes('emailComm') &&
Expand Down Expand Up @@ -498,7 +498,7 @@ class Register extends Component<Props, State> {
isNextStepDisabled(currentStep: number) {
const { formSuccess } = this.state;
if (
(currentStep === 0 && formSuccess.betacode) ||
// (currentStep === 0 && formSuccess.betacode) ||
(currentStep === 1 && formSuccess.checkboxes) ||
(currentStep === 2 && formSuccess.email) ||
currentStep === 5
Expand Down Expand Up @@ -618,7 +618,7 @@ class Register extends Component<Props, State> {
)}
</div>
<div className="flex-1">
{step === 0 && (
{/* {step === 0 && (
<>
<FormGroup className="mb-0 -mt-2">
<ControlLabel className="font-medium text-gray-500 select-none">
Expand All @@ -645,7 +645,6 @@ class Register extends Component<Props, State> {
formError.betacode && (
<BsXCircleFill className="text-red-500" />
)}
{/* <BsCheck className="mr-1 text-gray-400" /> */}
</InputGroup.Addon>
</InputGroup>
<div
Expand All @@ -656,7 +655,7 @@ class Register extends Component<Props, State> {
</div>
</FormGroup>
</>
)}
)} */}
{step === 1 && (
<>
<FormGroup className="-mt-2">
Expand Down Expand Up @@ -978,7 +977,7 @@ class Register extends Component<Props, State> {
{step !== 5 && (
<div className="w-8/12 flex-none self-center mb-2 registrationSteps select-none">
<Steps current={step} small>
<Steps.Item onClick={() => this.handleNextStep(0)} />
{/* <Steps.Item onClick={() => this.handleNextStep(0)} /> */}
<Steps.Item onClick={() => this.handleNextStep(1)} />
<Steps.Item onClick={() => this.handleNextStep(2)} />
<Steps.Item onClick={() => this.handleNextStep(3)} />
Expand Down
2 changes: 1 addition & 1 deletion app/main_window/actions/mailbox/folders.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Mail from '../../../services/mail.service';

import { Dispatch, GetState, FolderType } from '../../reducers/types';

export const UPDATE_FOLDER_COUNT = 'GLOBAL::UPDATE_FOLDER_COUNT';
export const UPDATE_FOLDER_COUNT = 'FOLDER::UPDATE_FOLDER_COUNT';
const updateCount = (id: number, amount: number) => {
return {
type: UPDATE_FOLDER_COUNT,
Expand Down
1 change: 1 addition & 0 deletions app/main_window/components/Mail/MessageDisplay/MessageDisplay.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ function MessageDisplay(props: Props) {
<div style={divStyle}>
{renderHTML(bodyAsHtml)}

{/* Closing loader if html is blank, 1px */}
<img src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" />
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@telios/client-sdk": "^5.0.3",
"@telios/nebula-drive": "^5.3.1",
"@types/prismjs": "^1.16.1",
"@telios/telios-client-backend": "^3.5.8",
"@telios/telios-client-backend": "^3.5.10",
"del": "^6.0.0",
"file-type": "^16.1.0",
"memorystream": "^0.3.1",
Expand Down
8 changes: 4 additions & 4 deletions app/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,10 @@
stopwords "^0.0.9"
uuid "^8.2.0"

"@telios/telios-client-backend@^3.5.8":
version "3.5.8"
resolved "https://registry.yarnpkg.com/@telios/telios-client-backend/-/telios-client-backend-3.5.8.tgz#de297d73e41dde9f320406c6a57841780a9e876c"
integrity sha512-2ZiQLapdLrfYBkYeGsWnfYGPrdmeVgdxsLxP/o3RBWGJ+u8VOzU+G0dHX4oA+WlgZeB5jY+hcNkYXCk1OP2Z8w==
"@telios/telios-client-backend@^3.5.10":
version "3.5.10"
resolved "https://registry.yarnpkg.com/@telios/telios-client-backend/-/telios-client-backend-3.5.10.tgz#420f82f3777d83d904873e67cd47518ed8e63971"
integrity sha512-WqQBBQfBRELyO4xoSJq9cp+RiNoIyU/lnJHYh4oMS2dcBCsdy8amWH6s8x9J40py9wxwECzpsx+BAwtNS+Xk1w==
dependencies:
"@telios/client-sdk" "^5.1.1"
"@telios/nebula" "^2.5.1"
Expand Down

0 comments on commit 5e39171

Please sign in to comment.