diff --git a/package.json b/package.json index b964dcac..6a55e56f 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "versions": { "native": "220204", "major": 3, - "minor": 3, - "patch": 1, + "minor": 1, + "patch": 2, "expo": "44.0.0" }, "description": "tooot app for Mastodon", diff --git a/src/components/mediaSelector.ts b/src/components/mediaSelector.ts index 478bf3ec..4a5af36b 100644 --- a/src/components/mediaSelector.ts +++ b/src/components/mediaSelector.ts @@ -4,7 +4,7 @@ import * as ImageManipulator from 'expo-image-manipulator' import * as ImagePicker from 'expo-image-picker' import { ImageInfo } from 'expo-image-picker/build/ImagePicker.types' import i18next from 'i18next' -import { Alert, Linking } from 'react-native' +import { Alert, Linking, Platform } from 'react-native' export interface Props { mediaTypes?: ImagePicker.MediaTypeOptions @@ -91,7 +91,11 @@ const mediaSelector = async ({ } else { const result = await ImagePicker.launchImageLibraryAsync({ mediaTypes, - exif: false + exif: false, + presentationStyle: + Platform.OS === 'ios' && parseInt(Platform.Version) < 13 + ? 0 + : -2 }) if (!result.cancelled) { diff --git a/src/utils/slices/instancesSlice.ts b/src/utils/slices/instancesSlice.ts index 80d825aa..3bc3b4d9 100644 --- a/src/utils/slices/instancesSlice.ts +++ b/src/utils/slices/instancesSlice.ts @@ -169,10 +169,11 @@ const instancesSlice = createSlice({ action: PayloadAction ) => { const activeIndex = findInstanceActive(instances) - instances[activeIndex].timelinesLookback = { - ...instances[activeIndex].timelinesLookback, - ...action.payload - } + instances[activeIndex] && + (instances[activeIndex].timelinesLookback = { + ...instances[activeIndex].timelinesLookback, + ...action.payload + }) }, updateInstanceMePage: ( { instances },