Merge pull request #589 from textileio/andrew/wait-connect-fix

Fixes where it says wait
textileio · Oct 5, 2018 · 92945c9 · 92945c9
2 parents 613d078 + 0692ec4
commit 92945c9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/App/SB/views/ThreadInvite/index.js b/App/SB/views/ThreadInvite/index.js
@@ -123,7 +123,7 @@ class ThreadInvite extends React.PureComponent {
         <View style={styles.buttonSingle}>
           <Button
             style={styles.button}
-            title='Wait'
+            title={!success ? 'Wait' : 'Continue'}
             accessibilityLabel='Continue'
             onPress={this.cancel}
             disabled={!success}

diff --git a/App/Sagas/NodeLifecycle.ts b/App/Sagas/NodeLifecycle.ts
@@ -25,7 +25,7 @@ export function * manageNode () {
       if (yield select(PreferencesSelectors.verboseUi)) {
         yield call(displayNotification, 'App State Change: ' + action.payload.newState)
       }
-      yield call(logNewEvent, 'App State Change', action.payload.newState)
+      yield call(logNewEvent, 'State Change', action.payload.newState)
 
       // Create and start the node no matter what, even if it's already created and/or started it should be fine to call again
       // Use fork so we don't block listening for the next app state change while the node is created and started
@@ -111,11 +111,11 @@ function * stopNodeAfterDelay (ms: number) {
 }
 
 export function * backgroundTask () {
-  yield call(logNewEvent, 'Trigger', 'Background Task')
+  yield call(logNewEvent, 'Background trigger', 'Check new content')
 }
 
 export function * locationUpdate () {
-  yield call(logNewEvent, 'Trigger', 'Location Update')
+  yield call(logNewEvent, 'Location trigger', 'Check new content')
 }
 
 function displayNotification (message: string, title?: string) {

diff --git a/App/Sagas/NodeOnline.ts b/App/Sagas/NodeOnline.ts
@@ -1,10 +1,12 @@
-import { put, take } from 'redux-saga/effects'
+import {call, put, take} from 'redux-saga/effects'
 import { getType } from 'typesafe-actions'
 import TextileNodeActions from '../Redux/TextileNodeRedux'
 import StorageActions from '../Redux/StorageRedux'
+import {logNewEvent} from './DeviceLogs'
 
 export function * onNodeOnline () {
   while (yield take(getType(TextileNodeActions.nodeOnline))) {
+    yield call(logNewEvent, 'IPFS online', 'success')
     yield put(TextileNodeActions.refreshMessagesRequest())
     yield put(StorageActions.refreshLocalImagesRequest())
   }

diff --git a/App/Sagas/TextileSagas.ts b/App/Sagas/TextileSagas.ts
@@ -34,6 +34,7 @@ import CameraRollActions, { cameraRollSelectors, QueriedPhotosMap } from '../Red
 import { uploadFile } from './UploadFile'
 import Upload from 'react-native-background-upload'
 import { ThreadData } from '../Redux/PhotoViewingRedux'
+import {logNewEvent} from './DeviceLogs'
 
 export function * signUp (action: ActionType<typeof AuthActions.signUpRequest>) {
   const {referralCode, username, email, password} = action.payload
@@ -193,7 +194,9 @@ export function * refreshMessages () {
     try {
       yield call(TextileNode.refreshMessages)
       yield put(TextileNodeActions.refreshMessagesSuccess(Date.now()))
+      yield call(logNewEvent, 'Refresh messages', 'Checked offline messages')
     } catch (error) {
+      yield call(logNewEvent, 'Refresh messages', error.message, true)
       yield put(TextileNodeActions.refreshMessagesFailure(error))
     }
   }