This commit is contained in:
Zhiyuan Zheng 2021-05-30 15:40:06 +02:00
parent 20e4ef69ea
commit 8df45475d8
5 changed files with 14 additions and 12 deletions

View File

@ -69,7 +69,10 @@ const apiGeneral = async <T = unknown>({
error.response.status,
error.response.data.error
)
return Promise.reject(error.response.data.error)
return Promise.reject({
status: error.response.status,
message: error.response.data.error
})
} else if (error.request) {
// The request was made but no response was received
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of

View File

@ -98,7 +98,10 @@ const apiInstance = async <T = unknown>({
error.response.status,
error.response.data.error
)
return Promise.reject(error.response.data.error)
return Promise.reject({
status: error.response.status,
message: error.response.data.error
})
} else if (error.request) {
// The request was made but no response was received
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of

View File

@ -31,7 +31,7 @@ const TimelineTranslate = React.memo(
const settingsLanguage = useSelector(getSettingsLanguage)
if (settingsLanguage.includes(tootLanguage)) {
if (settingsLanguage?.includes(tootLanguage)) {
return null
}

View File

@ -43,11 +43,7 @@ const netInfo = async (): Promise<{
})
.catch(error => {
log('error', 'netInfo', 'local credential check failed')
if (
error.status &&
typeof error.status === 'number' &&
error.status === 401
) {
if (error.status && error.status == 401) {
store.dispatch(removeInstance(instance))
}
return Promise.resolve({

View File

@ -4,7 +4,7 @@ import * as Analytics from 'expo-firebase-analytics'
import * as Localization from 'expo-localization'
import { pickBy } from 'lodash'
enum availableLanguages {
enum AvailableLanguages {
'zh-Hans',
'en'
}
@ -19,7 +19,7 @@ export const changeAnalytics = createAsyncThunk(
export type SettingsState = {
fontsize: -1 | 0 | 1 | 2 | 3
language: keyof availableLanguages
language: string
theme: 'light' | 'dark' | 'auto'
browser: 'internal' | 'external'
analytics: boolean
@ -31,10 +31,10 @@ export const settingsInitialState = {
enabled: false
},
language: Object.keys(
pickBy(availableLanguages, (_, key) => Localization.locale.includes(key))
pickBy(AvailableLanguages, (_, key) => Localization.locale.includes(key))
)
? Object.keys(
pickBy(availableLanguages, (_, key) =>
pickBy(AvailableLanguages, (_, key) =>
Localization.locale.includes(key)
)
)[0]