fix focus and blur events for setting feature id. filter photos that …

…have temp ids before uploading

app/actions/camera.js

@@ -93,7 +93,10 @@ export function deletePhoto (photo) {
 export function uploadPendingPhotos () {
   return async (dispatch, getState) => {
     const { photos } = getState().photos
-    const pendingPhotos = photos.filter(photo => photo.status === 'pending')
+    const pendingPhotos = photos.filter(photo => {
+      // filter pending and photos that are associated with uploaded features
+      return (photo.status === 'pending' && (photo.featureId === null || photo.featureId.search('observe-') === -1))
+    })
     for (let photo of pendingPhotos) {
       dispatch(uploadingPhoto(photo))
       try {

app/screens/CameraScreen.js

@@ -68,7 +68,16 @@ class CameraScreen extends React.Component {
     feature: null
   }
 
-  async componentWillMount () {
+  async componentDidMount () {
+    this.props.navigation.addListener('willFocus', payload => {
+      this.willFocus()
+    })
+    this.props.navigation.addListener('willBlur', payload => {
+      this.willBlur()
+    })
+  }
+
+  async willFocus () {
     const { status } = await Permissions.askAsync(Permissions.CAMERA)
     const { navigation } = this.props
     const { state: { params: { feature } } } = navigation
@@ -81,6 +90,15 @@ class CameraScreen extends React.Component {
     })
   }
 
+  willBlur () {
+    this.setState({
+      image: null,
+      location: null,
+      description: null,
+      feature: null
+    })
+  }
+
   async snap () {
     if (this.camera) {
       let { uri, width, height } = await this.camera.takePictureAsync()