diff --git a/package.json b/package.json index a84b9fb8..184bcccd 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "native": "211218", "major": 3, "minor": 0, - "patch": 0, + "patch": 1, "expo": "44.0.0" }, "description": "tooot app for Mastodon", diff --git a/src/screens/Compose/utils/post.ts b/src/screens/Compose/utils/post.ts index d482493e..9be1334c 100644 --- a/src/screens/Compose/utils/post.ts +++ b/src/screens/Compose/utils/post.ts @@ -15,8 +15,8 @@ const composePost = async ( method: 'get', url: `statuses/${composeState.replyToStatus.id}` }) - } catch (err) { - if (err.status && err.status == 404) { + } catch (err: any) { + if (err && err.status && err.status == 404) { return Promise.reject({ removeReply: true }) } } diff --git a/src/screens/Tabs/Me/Root.tsx b/src/screens/Tabs/Me/Root.tsx index 5da98fe8..f6bfeb49 100644 --- a/src/screens/Tabs/Me/Root.tsx +++ b/src/screens/Tabs/Me/Root.tsx @@ -11,6 +11,7 @@ import accountInitialState from '@screens/Tabs/Shared/Account/utils/initialState import accountReducer from '@screens/Tabs/Shared/Account/utils/reducer' import { useProfileQuery } from '@utils/queryHooks/profile' import { getInstanceActive } from '@utils/slices/instancesSlice' +import { StyleConstants } from '@utils/styles/constants' import React, { useReducer, useRef } from 'react' import Animated, { useAnimatedScrollHandler, @@ -49,6 +50,7 @@ const TabMeRoot: React.FC = () => { keyboardShouldPersistTaps='handled' onScroll={onScroll} scrollEventThrottle={16} + style={{ marginBottom: StyleConstants.Spacing.L }} > {instanceActive !== -1 ? ( diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx index 825cbff3..94a77a99 100644 --- a/src/screens/Tabs/Shared/Toot.tsx +++ b/src/screens/Tabs/Shared/Toot.tsx @@ -38,12 +38,13 @@ const TabSharedToot: React.FC> = ({ if (!scrolled.current) { scrolled.current = true const pointer = findIndex(flattenData, ['id', toot.id]) - setTimeout(() => { - flRef.current?.scrollToIndex({ - index: pointer === -1 ? 0 : pointer, - viewOffset: 100 - }) - }, 500) + pointer > 0 && + setTimeout(() => { + flRef.current?.scrollToIndex({ + index: pointer, + viewOffset: 100 + }) + }, 1000) } } }) diff --git a/src/utils/push/useConnect.ts b/src/utils/push/useConnect.ts index e0ef63fb..08c30f00 100644 --- a/src/utils/push/useConnect.ts +++ b/src/utils/push/useConnect.ts @@ -29,7 +29,7 @@ const pushUseConnect = ({ mode, t, instances, dispatch }: Params) => { url: `push/connect/${expoToken}`, sentry: true }).catch(error => { - if (error.status == 410) { + if (error.status == 404) { displayMessage({ mode, type: 'error',