diff --git a/ios/app/Info.plist b/ios/app/Info.plist index 3450031861..5b5202592c 100644 --- a/ios/app/Info.plist +++ b/ios/app/Info.plist @@ -48,12 +48,12 @@ + NSCameraUsageDescription + NSLocationWhenInUseUsageDescription NSPhotoLibraryUsageDescription - NSCameraUsageDescription - UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities diff --git a/src/state/models/user-local-photos.ts b/src/state/models/user-local-photos.ts index 12b95e376f..9a14550391 100644 --- a/src/state/models/user-local-photos.ts +++ b/src/state/models/user-local-photos.ts @@ -18,8 +18,8 @@ export class UserLocalPhotosModel { } private async _getPhotos() { - runInAction(() => { - CameraRoll.getPhotos({first: 20}).then(r => { + CameraRoll.getPhotos({first: 20}).then(r => { + runInAction(() => { this.photos = r.edges }) }) diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index 208e8070b7..f4af4c61e3 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -23,9 +23,14 @@ export const PhotoCarouselPicker = ({ cropping: true, width: 1000, height: 1000, - }).then(item => { - setSelectedPhotos([item.path, ...selectedPhotos]) - }) + }).then( + item => { + setSelectedPhotos([item.path, ...selectedPhotos]) + }, + _err => { + // ignore + }, + ) }, [selectedPhotos, setSelectedPhotos]) const handleSelectPhoto = useCallback( @@ -58,14 +63,7 @@ export const PhotoCarouselPicker = ({ }) result.push(img.path) } - setSelectedPhotos([ - // ...items.reduce( - // (accum, cur) => accum.concat(cur.sourceURL!), - // [] as string[], - // ), - ...result, - ...selectedPhotos, - ]) + setSelectedPhotos([...result, ...selectedPhotos]) }) }, [selectedPhotos, setSelectedPhotos]) diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx index 04a5f2383b..21f4ef060a 100644 --- a/src/view/com/util/UserBanner.tsx +++ b/src/view/com/util/UserBanner.tsx @@ -1,7 +1,7 @@ -import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome' import React, {useCallback} from 'react' import {Alert, StyleSheet, View, TouchableOpacity} from 'react-native' import Svg, {Rect, Defs, LinearGradient, Stop} from 'react-native-svg' +import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {getGradient} from '../../lib/asset-gen' import {colors} from '../../lib/styles'