Changes manifest setting from singleInstance => singleTask (#1286)

andrewxhill · web-flow · commit 0b0c266ecfec · 2019-08-07T18:35:37.000-07:00
* singleInstance =&gt; singleTask
diff --git a/App/Components/ProcessingThread.tsx b/App/Components/ProcessingThread.tsx
@@ -279,7 +279,7 @@ const mapDispatchToProps = (dispatch: Dispatch<RootAction>): DispatchProps => {
       )
     },
     retryInternal: (inviteId: string, threadName?: string) => {
-      dispatch(ThreadsActions.acceptInviteRequest(inviteId, threadName))
+      dispatch(ThreadsActions.acceptInviteRequest(inviteId, threadName, true))
     },
     dismiss: (inviteId: string) => {
       dispatch(ThreadsActions.acceptInviteDismiss(inviteId))
diff --git a/App/Containers/AddCaptionScreen.tsx b/App/Containers/AddCaptionScreen.tsx
@@ -50,6 +50,9 @@ class AddCaptionScreen extends React.Component<Props> {
 
   static navigationOptions = ({ navigation }: NavigationScreenProps) => {
     const params = navigation.state.params || {}
+    // I can't explain why yet, but the two callbacks remain null for 500ms after page loads
+    // if you click and these are null, nothing happens.
+    const unavailable = !params.shareToNewThread
     return {
       headerTitle: 'Share Photo',
       headerLeft: (
@@ -70,11 +73,11 @@ class AddCaptionScreen extends React.Component<Props> {
       headerRight: (
         <TextileHeaderButtons>
           <Item
-            color={params.disableShare ? '#99c0ef' : 'blue'}
+            color={unavailable || params.disableShare ? '#99c0ef' : 'blue'}
             title="Share"
             /* tslint:disable-next-line */
             onPress={() => {
-              if (params.disableShare) {
+              if (unavailable || params.disableShare) {
                 return
               }
               if (params.withPhoto && params.withThreadName) {
@@ -99,7 +102,7 @@ class AddCaptionScreen extends React.Component<Props> {
     this.props.updateComment(text)
   }
 
-  componentWillMount() {
+  componentDidMount() {
     // TODO: Investigate why share would ever be null? https://github.com/textileio/textile-mobile/issues/888
     this.props.navigation.setParams({
       disableShare:
diff --git a/App/Containers/FeedList/index.tsx b/App/Containers/FeedList/index.tsx
@@ -183,12 +183,7 @@ class Notifications extends React.Component<Props, State> {
       return
     }
 
-    return (
-      <AlertRow
-        message={this.props.alert}
-        onClick={this.registerCafe}
-      />
-    )
+    return <AlertRow message={this.props.alert} onClick={this.registerCafe} />
   }
   _renderItems() {
     return (
@@ -211,7 +206,9 @@ class Notifications extends React.Component<Props, State> {
     // the initial refresh has completed and returned 0 results. This is to avoid the art
     // flickering for a second and then disappearing, which is ugly.
     const showNotifications =
-      this.state.focusRefreshInProgress || this.props.notifications.length > 0 || this.props.alert
+      this.state.focusRefreshInProgress ||
+      this.props.notifications.length > 0 ||
+      this.props.alert
     return (
       <View style={styles.container}>
         {!showNotifications && this._renderOnboarding()}
@@ -233,7 +230,10 @@ const mapStateToProps = (state: RootState): StateProps => {
   const showOnboarding = state.preferences.tourScreens.feed === true
   const refreshing = state.notifications.refreshing
 
-  const alert = Object.keys(state.cafes.cafes).length > 0 ? undefined : 'Improve app performance by choosing an account cafe now.'
+  const alert =
+    Object.keys(state.cafes.cafes).length > 0
+      ? undefined
+      : 'Improve app performance by choosing an account cafe now.'
 
   return {
     alert,
diff --git a/App/Containers/PhotoScreen.tsx b/App/Containers/PhotoScreen.tsx
@@ -15,7 +15,7 @@ import { threadDataByThreadId } from '../Redux/GroupsSelectors'
 import { color } from '../styles'
 import { CommentData } from '../Components/comments'
 import { accountSelectors } from '../features/account'
-import { groupPhoto } from '../features/group/selectors';
+import { groupPhoto } from '../features/group/selectors'
 
 const screenWidth = Dimensions.get('screen').width
 
@@ -149,7 +149,8 @@ const mapStateToProps = (state: RootState): StateProps => {
     threadName = threadData ? threadData.name : undefined
   }
   const photoId = state.photoViewing.viewingPhoto
-  const photo = threadId && photoId ? groupPhoto(state.group, threadId, photoId) : undefined
+  const photo =
+    threadId && photoId ? groupPhoto(state.group, threadId, photoId) : undefined
   const selfAddress = accountSelectors.getAddress(state.account) || ''
   const removing = photo
     ? Object.keys(state.group.ignore)
diff --git a/App/Containers/WalletPicker.tsx b/App/Containers/WalletPicker.tsx
@@ -30,9 +30,15 @@ class TextileWalletPicker extends React.PureComponent<Props> {
     const showImagePicker = navigation.getParam('showImagePicker')
 
     const cameraRoll = () => {
+      if (!showImagePicker) {
+        return
+      }
       showImagePicker('camera-roll')
     }
     const camera = () => {
+      if (!showImagePicker) {
+        return
+      }
       showImagePicker('camera')
     }
     const onPress = () => {
@@ -46,12 +52,32 @@ class TextileWalletPicker extends React.PureComponent<Props> {
       </TextileHeaderButtons>
     )
     const headerTitle = 'Recent Photos'
+
+    /**
+     * Android note.
+     * I can't explain why yet, but the two callbacks remain null for 500ms after page loads.
+     * So now if you click them early nothing will happen (also grey'd out)
+     * This is related to changing the launchMode="singleInstance" to
+     * launchMode="singleTop"
+     */
+    const imagePickerProps = !showImagePicker ? { color: '#a9a9a9' } : {}
     const headerRight = (
       <TextileHeaderButtons>
-        <Item title="camera" iconName="camera-create" onPress={camera} />
-        <Item title="camera roll" iconName="image" onPress={cameraRoll} />
+        <Item
+          title="camera"
+          iconName="camera-create"
+          onPress={camera}
+          {...imagePickerProps}
+        />
+        <Item
+          title="camera roll"
+          iconName="image"
+          onPress={cameraRoll}
+          {...imagePickerProps}
+        />
       </TextileHeaderButtons>
     )
+
     return {
       headerTitle,
       headerLeft,
diff --git a/App/Redux/ThreadsRedux.ts b/App/Redux/ThreadsRedux.ts
@@ -71,8 +71,8 @@ const actions = {
   acceptInviteRequest: createAction(
     'ACCEPT_THREAD_NOTIFICATION_INVITE',
     resolve => {
-      return (notificationId: string, threadName?: string) =>
-        resolve({ notificationId, threadName })
+      return (notificationId: string, threadName?: string, goBack?: boolean) =>
+        resolve({ notificationId, threadName, goBack })
     }
   ),
   addInternalInvitesRequest: createAction(
diff --git a/App/Redux/UIRedux.ts b/App/Redux/UIRedux.ts
@@ -135,11 +135,17 @@ export function reducer(
   switch (action.type) {
     case getType(actions.updateSharingPhotoImage): {
       const { image } = action.payload
-      return { ...state, sharingPhoto: { ...state.sharingPhoto, image } }
+      return {
+        ...state,
+        sharingPhoto: { ...state.sharingPhoto, image, files: undefined }
+      }
     }
     case getType(actions.updateSharingPhotoFiles): {
       const { files } = action.payload
-      return { ...state, sharingPhoto: { ...state.sharingPhoto, files } }
+      return {
+        ...state,
+        sharingPhoto: { ...state.sharingPhoto, files, image: undefined }
+      }
     }
     case getType(actions.updateSharingPhotoThread): {
       const { threadId } = action.payload
diff --git a/App/SB/components/AlertRow/index.tsx b/App/SB/components/AlertRow/index.tsx
@@ -19,13 +19,13 @@ class AlertRow extends React.PureComponent<AlertRowProps> {
     const dateText = 'now'
 
     const readStyle: ViewStyle = {
-          width: 29,
-          height: 29,
-          borderRadius: 16,
-          borderWidth: 0,
-          borderColor: 'rgba(255, 28, 63, 0.2)',
-          backgroundColor: 'rgba(255, 28, 63, 0.2)'
-        }
+      width: 29,
+      height: 29,
+      borderRadius: 16,
+      borderWidth: 0,
+      borderColor: 'rgba(255, 28, 63, 0.2)',
+      backgroundColor: 'rgba(255, 28, 63, 0.2)'
+    }
 
     return (
       <TouchableOpacity
@@ -42,18 +42,14 @@ class AlertRow extends React.PureComponent<AlertRowProps> {
                 alignItems: 'center',
                 alignContent: 'center'
               }}
-            >
-            </View>
+            />
           </View>
         </View>
         <View style={styles.textContainer}>
           <Text style={styles.text}>{message}</Text>
-          <Text style={[styles.timestamp, styles.unread]}>
-            {dateText}
-          </Text>
-        </View>
-        <View style={{ width: 40, height: 40, overflow: 'hidden' }}>
+          <Text style={[styles.timestamp, styles.unread]}>{dateText}</Text>
         </View>
+        <View style={{ width: 40, height: 40, overflow: 'hidden' }} />
       </TouchableOpacity>
     )
   }
diff --git a/App/SB/components/ContactSelect/index.tsx b/App/SB/components/ContactSelect/index.tsx
@@ -146,6 +146,12 @@ export class ContactSelectComponent extends React.Component<
     )
   }
 
+  renderFooter = () => {
+    // Provides a quick fix until this layout is replaces.
+    // Without it the bottom two rows are sometimes not selectable.
+    return <View style={{ ...styles.contactItem, minHeight: 120 }} />
+  }
+
   renderRow = (contact: ListRenderItemInfo<IncludedContact>) => {
     const { item } = contact
     const selectState =
@@ -167,6 +173,7 @@ export class ContactSelectComponent extends React.Component<
         keyExtractor={this.keyExtractor}
         extraData={this.props.selected}
         ListHeaderComponent={this.renderHeader()}
+        ListFooterComponent={this.renderFooter()}
         renderItem={this.renderRow}
       />
     )
diff --git a/App/SB/components/FeedItem/index.tsx b/App/SB/components/FeedItem/index.tsx
@@ -99,4 +99,4 @@ class FeedItem extends React.PureComponent<FeedItemProps> {
   }
 }
 
-export default FeedItem
+export default FeedItem
diff --git a/App/Sagas/NotificationsSagas.ts b/App/Sagas/NotificationsSagas.ts
@@ -9,6 +9,7 @@ import Textile, {
 } from '@textile/react-native-sdk'
 import NavigationService from '../Services/NavigationService'
 
+import { groupActions } from '../features/group'
 import ThreadsActions from '../Redux/ThreadsRedux'
 import GroupsActions, { ThreadData } from '../Redux/GroupsRedux'
 import { threadDataByThreadId, allThreadIds } from '../Redux/GroupsSelectors'
@@ -108,6 +109,22 @@ export function* handleEngagement(
   }
 }
 
+function* requestAndNavigateTo(threadId: string, photoBlock?: string) {
+  // Cache our thread data in redux
+  yield put(groupActions.feed.loadFeedItems.request({ id: threadId }))
+  // Select the thread
+  yield put(PhotoViewingActions.viewThread(threadId))
+
+  if (photoBlock) {
+    // if photo supplied, select and navigate to it
+    yield put(PhotoViewingActions.viewPhoto(photoBlock))
+    yield call(NavigationService.navigate, 'PhotoScreen')
+  } else {
+    // if no photo, navigate to the thread only
+    yield call(NavigationService.navigate, 'ViewThread', { threadId })
+  }
+}
+
 export function* notificationView(
   action: ActionType<typeof NotificationsActions.notificationSuccess>
 ) {
@@ -117,28 +134,26 @@ export function* notificationView(
   try {
     yield call(Textile.notifications.read, notification.id)
     switch (notification.type) {
+      case Notification.Type.LIKE_ADDED:
       case Notification.Type.COMMENT_ADDED: {
         const threadData: ThreadData | undefined = yield select(
           threadDataByThreadId,
           notification.threadId
         )
         if (threadData) {
-          yield put(PhotoViewingActions.viewThread(threadData.id))
-          yield put(PhotoViewingActions.viewPhoto(notification.target))
-          yield call(NavigationService.navigate, 'PhotoScreen')
+          // notification.target of a COMMENT_ADDED / LIKE_ADDED is the photo block, so where we want to navigate
+          yield call(requestAndNavigateTo, threadData.id, notification.target)
         }
         break
       }
-      case Notification.Type.LIKE_ADDED:
       case Notification.Type.FILES_ADDED: {
         const threadData: ThreadData | undefined = yield select(
           threadDataByThreadId,
           notification.threadId
         )
         if (threadData) {
-          yield put(PhotoViewingActions.viewThread(threadData.id))
-          yield put(PhotoViewingActions.viewPhoto(notification.target))
-          yield call(NavigationService.navigate, 'PhotoScreen')
+          // notification.block of a FILES_ADDED is the photo block, so where we want to navigate
+          yield call(requestAndNavigateTo, threadData.id, notification.block)
         }
         break
       }
@@ -150,10 +165,7 @@ export function* notificationView(
           notification.threadId
         )
         if (threadData) {
-          yield put(PhotoViewingActions.viewThread(threadData.id))
-          yield call(NavigationService.navigate, 'ViewThread', {
-            threadId: threadData.id
-          })
+          yield call(requestAndNavigateTo, threadData.id)
         }
         break
       }
@@ -224,7 +236,8 @@ export function* reviewThreadInvite(
     yield put(
       ThreadsActions.acceptInviteRequest(
         notification.id,
-        notification.threadName
+        notification.threadName,
+        false
       )
     )
   } catch (error) {
diff --git a/App/Sagas/PhotoViewingSagas.ts b/App/Sagas/PhotoViewingSagas.ts
@@ -50,14 +50,12 @@ export function* monitorNewThreadActions() {
     }
 
     if (shouldNav) {
-      yield put(PhotoViewingActions.viewThread(id))
-      yield delay(700)
-      yield call(NavigationService.navigate, 'ViewThread', { threadId: id })
+      yield put(UIActions.navigateToThreadRequest(id, name))
     } else if (shouldSelect) {
       yield put(UIActions.updateSharingPhotoThread(id))
     } else if (invite) {
-      yield put(PhotoViewingActions.viewThread(id))
-      yield call(NavigationService.navigate, 'ViewThread', { threadId: id })
+      yield call(NavigationService.navigate, 'Groups')
+      yield put(UIActions.navigateToThreadRequest(id, name))
     }
   }
 }
diff --git a/App/Sagas/TextileSagas.ts b/App/Sagas/TextileSagas.ts
@@ -11,6 +11,7 @@
  *************************************************************/
 import { Share, PermissionsAndroid, Platform } from 'react-native'
 import { call, put, select } from 'redux-saga/effects'
+import { delay } from 'redux-saga'
 import Config from 'react-native-config'
 import Textile, { ILogLevel, LogLevel } from '@textile/react-native-sdk'
 
@@ -21,14 +22,19 @@ import PreferencesActions, {
   PreferencesSelectors
 } from '../Redux/PreferencesRedux'
 import UIActions from '../Redux/UIRedux'
-import { ActionType } from 'typesafe-actions'
 import GroupsActions from '../Redux/GroupsRedux'
+import { ActionType } from 'typesafe-actions'
 import PhotoViewingActions from '../Redux/PhotoViewingRedux'
 import { logNewEvent } from './DeviceLogs'
+import { threadDataByThreadId } from '../Redux/GroupsSelectors'
 
 export function* navigateToThread(
   action: ActionType<typeof UIActions.navigateToThreadRequest>
 ) {
+  const data = yield select(threadDataByThreadId, action.payload.threadId)
+  if (!data) {
+    return
+  }
   yield put(PhotoViewingActions.viewThread(action.payload.threadId))
   yield call(NavigationService.navigate, 'ViewThread', {
     threadId: action.payload.threadId
diff --git a/App/Sagas/ThreadsSagas.ts b/App/Sagas/ThreadsSagas.ts
diff --git a/App/features/cafes/sagas.ts b/App/features/cafes/sagas.ts
diff --git a/App/features/group/selectors.ts b/App/features/group/selectors.ts
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ const mapDispatchToProps = (dispatch: Dispatch<RootAction>): DispatchProps => {`
`279`	`279`	`)`
`280`	`280`	`},`
`281`	`281`	`retryInternal: (inviteId: string, threadName?: string) => {`
`282`		`- dispatch(ThreadsActions.acceptInviteRequest(inviteId, threadName))`
	`282`	`+ dispatch(ThreadsActions.acceptInviteRequest(inviteId, threadName, true))`
`283`	`283`	`},`
`284`	`284`	`dismiss: (inviteId: string) => {`
`285`	`285`	`dispatch(ThreadsActions.acceptInviteDismiss(inviteId))`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,12 @@ export class ContactSelectComponent extends React.Component<`
`146`	`146`	`)`
`147`	`147`	`}`
`148`	`148`
	`149`	`+ renderFooter = () => {`
	`150`	`+ // Provides a quick fix until this layout is replaces.`
	`151`	`+ // Without it the bottom two rows are sometimes not selectable.`
	`152`	`+ return <View style={{ ...styles.contactItem, minHeight: 120 }} />`
	`153`	`+ }`
	`154`	`+`
`149`	`155`	`renderRow = (contact: ListRenderItemInfo<IncludedContact>) => {`
`150`	`156`	`const { item } = contact`
`151`	`157`	`const selectState =`
`@@ -167,6 +173,7 @@ export class ContactSelectComponent extends React.Component<`
`167`	`173`	`keyExtractor={this.keyExtractor}`
`168`	`174`	`extraData={this.props.selected}`
`169`	`175`	`ListHeaderComponent={this.renderHeader()}`
	`176`	`+ ListFooterComponent={this.renderFooter()}`
`170`	`177`	`renderItem={this.renderRow}`
`171`	`178`	`/>`
`172`	`179`	`)`
Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,4 @@ class FeedItem extends React.PureComponent<FeedItemProps> {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`-export default FeedItem`
	`102`	`+export default FeedItem`