octo/tooot
octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2024-12-22 07:34:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix details on timeline

Browse Source
This commit is contained in:
Zhiyuan Zheng 2021-03-04 14:11:08 +01:00
parent cc02626adb
commit ed9a58355a
No known key found for this signature in database
GPG Key ID: 078A93AB607D85E0
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/development.yml vendored
View File

@ -46,5 +46,6 @@ jobs:
ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
ANDROID_KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_KEY_PASSWORD }}
SUPPLY_JSON_KEY_DATA: ${{ secrets.SUPPLY_JSON_KEY_DATA }}
GH_PAT_GET_RELEASE: ${{ secrets.GH_PAT_GET_RELEASE }}
FL_GITHUB_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
run: yarn app:build

1
.github/workflows/staging.yml vendored
View File

@ -48,5 +48,6 @@ jobs:
ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
ANDROID_KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_KEY_PASSWORD }}
SUPPLY_JSON_KEY_DATA: ${{ secrets.SUPPLY_JSON_KEY_DATA }}
GH_PAT_GET_RELEASE: ${{ secrets.GH_PAT_GET_RELEASE }}
FL_GITHUB_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
run: yarn app:build

2
fastlane/Fastfile
View File

@ -143,7 +143,7 @@ private_lane :build_android do
end
lane :build do
releaseExists = get_github_release(url: GITHUB_REPO, version: GITHUB_RELEASE)
releaseExists = get_github_release(url: GITHUB_REPO, version: GITHUB_RELEASE, api_token: ENV['GH_PAT_GET_RELEASE'])
if releaseExists
puts("Release #{GITHUB_RELEASE} exists. Continue with building React Native only.")
else

1
src/Screens.tsx
View File

@ -85,7 +85,6 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
const showLocalCorrect = () => {
if (localCorrupt) {
displayMessage({
autoHide: false,
message: t('index.localCorrupt'),
description: localCorrupt.length ? localCorrupt : undefined,
type: 'error',

2
src/components/Message.tsx
View File

@ -49,7 +49,7 @@ const displayMessage = ({
}
showMessage({
duration: duration === 'short' ? 1500 : 3000,
duration: type === 'error' ? 5000 : duration === 'short' ? 1500 : 3000,
autoHide,
message,
description,

4
src/components/Timeline.tsx
View File

@ -58,8 +58,8 @@ const Timeline: React.FC<Props> = ({
...queryKey[1],
options: {
notifyOnChangeProps: Platform.select({
ios: ['data', 'isFetching'],
android: ['data', 'isFetching', 'isLoading']
ios: ['dataUpdatedAt', 'isFetching'],
android: ['dataUpdatedAt', 'isFetching', 'isLoading']
}),
getNextPageParam: lastPage =>
lastPage?.links?.next && { max_id: lastPage.links.next }

4
src/components/Timeline/Footer.tsx
View File

@ -18,7 +18,9 @@ const TimelineFooter = React.memo(
...queryKey[1],
options: {
enabled: !disableInfinity,
notifyOnChangeProps: ['hasNextPage']
notifyOnChangeProps: ['hasNextPage'],
getNextPageParam: lastPage =>
lastPage?.links?.next && { max_id: lastPage.links.next }
}
})