diff --git a/package.json b/package.json index bc2835fd..8db32a53 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "native": "220603", "major": 4, "minor": 1, - "patch": 3, + "patch": 4, "expo": "45.0.0" }, "description": "tooot app for Mastodon", diff --git a/src/components/ContextMenu/instance.ts b/src/components/ContextMenu/instance.ts index 3e0cd165..862a09e6 100644 --- a/src/components/ContextMenu/instance.ts +++ b/src/components/ContextMenu/instance.ts @@ -29,7 +29,7 @@ const contextMenuInstance = ({ const { theme } = useTheme() const currentInstance = useSelector(getInstanceUrl) - const instance = status.uri && status.uri.split(new RegExp(/\/\/(.*?)\//))[1] + const instance = status?.uri && status.uri.split(new RegExp(/\/\/(.*?)\//))[1] const queryClient = useQueryClient() const mutation = useTimelineMutation({ diff --git a/src/components/ContextMenu/status.ts b/src/components/ContextMenu/status.ts index 5579a390..20f94fb6 100644 --- a/src/components/ContextMenu/status.ts +++ b/src/components/ContextMenu/status.ts @@ -70,7 +70,7 @@ const contextMenuStatus = ({ getInstanceAccount, (prev, next) => prev.id === next.id ) - const ownAccount = instanceAccount?.id === status.account.id + const ownAccount = instanceAccount?.id === status?.account.id if (ownAccount) { const accountMenuItems: ContextMenuAction[] = [ diff --git a/src/components/Timeline/Shared/Translate.tsx b/src/components/Timeline/Shared/Translate.tsx index f699bf8e..f78272c3 100644 --- a/src/components/Timeline/Shared/Translate.tsx +++ b/src/components/Timeline/Shared/Translate.tsx @@ -48,14 +48,16 @@ const TimelineTranslate = React.memo( const [detectedLanguage, setDetectedLanguage] = useState('') useEffect(() => { const detect = async () => { - const result = await detectLanguage(text.join(`\n\n`)) - setDetectedLanguage(result.detected.slice(0, 2)) + const result = await detectLanguage(text.join(`\n\n`)).catch(() => { + // No need to log language detection failure + }) + result?.detected && setDetectedLanguage(result.detected.slice(0, 2)) } detect() }, []) const settingsLanguage = useSelector(getSettingsLanguage) - const targetLanguage = settingsLanguage || Localization.locale || 'en' + const targetLanguage = Localization.locale || settingsLanguage || 'en' const [enabled, setEnabled] = useState(false) const { refetch, data, isLoading, isSuccess, isError } = useTranslateQuery({ diff --git a/src/i18n/vi/components/contextMenu.json b/src/i18n/vi/components/contextMenu.json index 6e32fff5..d99cb59f 100644 --- a/src/i18n/vi/components/contextMenu.json +++ b/src/i18n/vi/components/contextMenu.json @@ -4,7 +4,7 @@ "title": "Hành động người dùng", "mute": { "action_false": "Ẩn người này", - "action_true": "Tương tác người dùng" + "action_true": "Bỏ ẩn người dùng" }, "block": { "action_false": "Chặn người này",