From abd190ca815cb15ce9cbf4a4d741ba42c1b0ac7d Mon Sep 17 00:00:00 2001 From: Youri Noel Nelson Date: Tue, 12 Apr 2022 11:28:12 -0400 Subject: [PATCH 1/3] read count --- app/main_window/actions/mailbox/folders.ts | 2 +- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/main_window/actions/mailbox/folders.ts b/app/main_window/actions/mailbox/folders.ts index 55105a4..9988be5 100644 --- a/app/main_window/actions/mailbox/folders.ts +++ b/app/main_window/actions/mailbox/folders.ts @@ -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, diff --git a/app/package.json b/app/package.json index 7945aa0..46cd902 100644 --- a/app/package.json +++ b/app/package.json @@ -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.9", "del": "^6.0.0", "file-type": "^16.1.0", "memorystream": "^0.3.1", diff --git a/app/yarn.lock b/app/yarn.lock index f92b29b..66b50c7 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -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.9": + version "3.5.9" + resolved "https://registry.yarnpkg.com/@telios/telios-client-backend/-/telios-client-backend-3.5.9.tgz#1b6b8ce6fe0f6ad4232dc5c2a1493c533c7ab2f3" + integrity sha512-77pGr36H9T+67hLxxayzfEeTBAFxal+j/ZmCB/frha3u53uWcDSRENxS9UmnP9ZLl45NaiaQtcTcz6ce6wLPmQ== dependencies: "@telios/client-sdk" "^5.1.1" "@telios/nebula" "^2.5.1" From 7bbba955f2058370bf7fbae4b9ceb5f8280b47a7 Mon Sep 17 00:00:00 2001 From: Youri Noel Nelson Date: Tue, 12 Apr 2022 12:28:12 -0400 Subject: [PATCH 2/3] removing beta codes --- app/login_window/components/Register.tsx | 137 +++++++++--------- .../Mail/MessageDisplay/MessageDisplay.tsx | 1 + 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/app/login_window/components/Register.tsx b/app/login_window/components/Register.tsx index 2c15381..0cf8d9a 100644 --- a/app/login_window/components/Register.tsx +++ b/app/login_window/components/Register.tsx @@ -90,10 +90,10 @@ class Register extends Component { masterpass: '', confirmpass: '', recoveryemail: '', - checkbox: [], - betacode: '' + checkbox: [] + // betacode: '' }, - step: 0, + step: 1, formError: {}, formSuccess: {}, canSubmit: false, @@ -115,7 +115,7 @@ class Register extends Component { 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); @@ -123,64 +123,64 @@ class Register extends Component { 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 }; @@ -267,7 +267,7 @@ class Register extends Component { const errors = Object.keys(formError).length; if ( - formValue.betacode && + // formValue.betacode && formValue.email && formValue.masterpass && formValue.confirmpass && @@ -281,8 +281,8 @@ class Register extends Component { 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); @@ -354,7 +354,7 @@ class Register extends Component { const errors = Object.keys(formError).length; if ( - formValue.betacode && + // formValue.betacode && formValue.email && formValue.masterpass && formValue.checkbox.includes('emailComm') && @@ -498,7 +498,7 @@ class Register extends Component { 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 @@ -618,7 +618,7 @@ class Register extends Component { )}
- {step === 0 && ( + {/* {step === 0 && ( <> @@ -645,7 +645,6 @@ class Register extends Component { formError.betacode && ( )} - {/* */}
{
- )} + )} */} {step === 1 && ( <> @@ -978,7 +977,7 @@ class Register extends Component { {step !== 5 && (
- this.handleNextStep(0)} /> + {/* this.handleNextStep(0)} /> */} this.handleNextStep(1)} /> this.handleNextStep(2)} /> this.handleNextStep(3)} /> diff --git a/app/main_window/components/Mail/MessageDisplay/MessageDisplay.tsx b/app/main_window/components/Mail/MessageDisplay/MessageDisplay.tsx index cd38121..1ac5f02 100644 --- a/app/main_window/components/Mail/MessageDisplay/MessageDisplay.tsx +++ b/app/main_window/components/Mail/MessageDisplay/MessageDisplay.tsx @@ -354,6 +354,7 @@ function MessageDisplay(props: Props) {
{renderHTML(bodyAsHtml)} + {/* Closing loader if html is blank, 1px */}
)} From ed2cd221b1eb37c28325487704720b6f86b3b126 Mon Sep 17 00:00:00 2001 From: hexadecibal Date: Tue, 12 Apr 2022 12:53:55 -0400 Subject: [PATCH 3/3] Upgrade client-backend to 3.5.10 for bodyAsHTML: false fix --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 46cd902..e5f0be9 100644 --- a/app/package.json +++ b/app/package.json @@ -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.9", + "@telios/telios-client-backend": "^3.5.10", "del": "^6.0.0", "file-type": "^16.1.0", "memorystream": "^0.3.1", diff --git a/app/yarn.lock b/app/yarn.lock index 66b50c7..f4a5c83 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -182,10 +182,10 @@ stopwords "^0.0.9" uuid "^8.2.0" -"@telios/telios-client-backend@^3.5.9": - version "3.5.9" - resolved "https://registry.yarnpkg.com/@telios/telios-client-backend/-/telios-client-backend-3.5.9.tgz#1b6b8ce6fe0f6ad4232dc5c2a1493c533c7ab2f3" - integrity sha512-77pGr36H9T+67hLxxayzfEeTBAFxal+j/ZmCB/frha3u53uWcDSRENxS9UmnP9ZLl45NaiaQtcTcz6ce6wLPmQ== +"@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"