0f96669f8c
* WIP * Update email * Fire off confirmation email after change * Verify step, integrate stateful control * Remove tentative EnterCode step * Handle token step * Handle instructions and integrate into 2FA setting * Fix load state when reusing same email * Add new state * Add 2FA screens * Clean up state in Update step * Clean up verify state, handle normal callback * Normalize convetions * Add verification reminder screen * Improve session refresh * Handle verification requirements for composer and convo * Fix lint * Do better * Couple missing translations * Format * Use listeners for easier to grok logic * Clean errors * Move to global context * [APP-1158] Gate features by email verification state (#8305) * Use new hook in all locations * Format * Seems to work, not great duplication * Wrap all open composer calls * Remove unneeded spans * Missed one * Fix handler on Conversation * Gate new chat in header * Add comment * Remove whoopsie * Format * add hackfix for dialog not showing * add prompt to accept chat btn * navigation not necessary * send back one screen, rather than home * Update comment --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com> * Clear dialog state Co-authored-by: Samuel Newman <mozzius@protonmail.com> * Update icon * Check color * Add 2FA warning * Update instructions * Fix X button * Use an effect silly goose * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/dialaUpdate copyogs/EmailDialog/screens/Update.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy * Update copy * Update copy * Update copy * Update copy Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update copy * Add link back to update email from verify email dialog * Handle token field validation --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com> Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>
92 lines
1.9 KiB
TypeScript
92 lines
1.9 KiB
TypeScript
import {useCallback} from 'react'
|
|
import {msg} from '@lingui/macro'
|
|
import {useLingui} from '@lingui/react'
|
|
|
|
type CleanedError = {
|
|
raw: string | undefined
|
|
clean: string | undefined
|
|
}
|
|
|
|
export function useCleanError() {
|
|
const {_} = useLingui()
|
|
|
|
return useCallback<(error?: any) => CleanedError>(
|
|
error => {
|
|
if (!error)
|
|
return {
|
|
raw: undefined,
|
|
clean: undefined,
|
|
}
|
|
|
|
let raw = error.toString()
|
|
|
|
if (isNetworkError(raw)) {
|
|
return {
|
|
raw,
|
|
clean: _(
|
|
msg`Unable to connect. Please check your internet connection and try again.`,
|
|
),
|
|
}
|
|
}
|
|
|
|
if (
|
|
raw.includes('Upstream Failure') ||
|
|
raw.includes('NotEnoughResources') ||
|
|
raw.includes('pipethrough network error')
|
|
) {
|
|
return {
|
|
raw,
|
|
clean: _(
|
|
msg`The server appears to be experiencing issues. Please try again in a few moments.`,
|
|
),
|
|
}
|
|
}
|
|
|
|
if (raw.includes('Bad token scope')) {
|
|
return {
|
|
raw,
|
|
clean: _(
|
|
msg`This feature is not available while using an app password. Please sign in with your main password.`,
|
|
),
|
|
}
|
|
}
|
|
|
|
if (raw.includes('Rate Limit Exceeded')) {
|
|
return {
|
|
raw,
|
|
clean: _(
|
|
msg`You've reached the maximum number of requests allowed. Please try again later.`,
|
|
),
|
|
}
|
|
}
|
|
|
|
if (raw.startsWith('Error: ')) {
|
|
raw = raw.slice('Error: '.length)
|
|
}
|
|
|
|
return {
|
|
raw,
|
|
clean: undefined,
|
|
}
|
|
},
|
|
[_],
|
|
)
|
|
}
|
|
|
|
const NETWORK_ERRORS = [
|
|
'Abort',
|
|
'Network request failed',
|
|
'Failed to fetch',
|
|
'Load failed',
|
|
]
|
|
|
|
export function isNetworkError(e: unknown) {
|
|
const str = String(e)
|
|
for (const err of NETWORK_ERRORS) {
|
|
if (str.includes(err)) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|