From 3b11667366a5941c0a2cb030f7e071bec45c981e Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Tue, 14 Aug 2018 15:32:36 -0500
Subject: [PATCH] Fix zombie note issue, update sfjs to 0.3.11, v2.3.4

---
 android/app/build.gradle     | 4 ++--
 ios/StandardNotes/Info.plist | 2 +-
 package-lock.json            | 8 ++++----
 package.json                 | 8 ++++----
 src/containers/NoteCell.js   | 2 +-
 src/lib/sfjs/modelManager.js | 9 ---------
 src/screens/Notes.js         | 4 ++--
 7 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5fd4f1d2..10433204 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -97,8 +97,8 @@ android {
         applicationId "com.standardnotes"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 2030300
-        versionName "2.3.3"
+        versionCode 2030400
+        versionName "2.3.4"
         multiDexEnabled  true
         ndk {
             abiFilters "armeabi-v7a", "x86"
diff --git a/ios/StandardNotes/Info.plist b/ios/StandardNotes/Info.plist
index f0abbb87..77af7a6a 100644
--- a/ios/StandardNotes/Info.plist
+++ b/ios/StandardNotes/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.3</string>
+	<string>2.3.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/package-lock.json b/package-lock.json
index daebb782..c7617ac0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "StandardNotes",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -9800,9 +9800,9 @@
       "integrity": "sha1-ATl5IuX2Ls8whFUiyVxP4dJefU4="
     },
     "standard-file-js": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.10.tgz",
-      "integrity": "sha512-eS9cFTG+IiLDyQ/ghKUV1rhMKEz1Aea42Jsu5YY9fxGJ43+W+PnMydCVTf9YRZW3bfh+sRr0ut7QgWa8hTMJ7A=="
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.11.tgz",
+      "integrity": "sha512-RV5J8dzm9Wj2/1EWBJVeGo6y99tEXAynlVHB2Ii3rIYh8kh4gGxHUsLiLEfEYLpAHCIO86L5/AmaZRSIKziYCw=="
     },
     "static-extend": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index 2c845e89..a80a6a4f 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "StandardNotes",
-  "version": "2.3.3",
-  "versionIOS": "2.3.3",
-  "versionAndroid": "2.3.3",
+  "version": "2.3.4",
+  "versionIOS": "2.3.4",
+  "versionAndroid": "2.3.4",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -22,7 +22,7 @@
     "react-native-vector-icons": "^4.3.0",
     "regenerator": "^0.13.2",
     "sn-models": "0.1.8",
-    "standard-file-js": "0.3.10"
+    "standard-file-js": "0.3.11"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
diff --git a/src/containers/NoteCell.js b/src/containers/NoteCell.js
index af17af75..059e3df5 100644
--- a/src/containers/NoteCell.js
+++ b/src/containers/NoteCell.js
@@ -156,7 +156,7 @@ export default class NoteCell extends React.PureComponent {
               <Text style={this.styles.deleting}>Deleting...</Text>
             }
 
-            {note.conflictOf &&
+            {note.conflict_of &&
               <Text style={this.styles.deleting}>Conflicted Copy</Text>
             }
 
diff --git a/src/lib/sfjs/modelManager.js b/src/lib/sfjs/modelManager.js
index 635dbf05..833f043f 100644
--- a/src/lib/sfjs/modelManager.js
+++ b/src/lib/sfjs/modelManager.js
@@ -37,15 +37,6 @@ export default class ModelManager extends SFModelManager {
     this.themes.length = 0;
   }
 
-  findOrCreateTagByTitle(title) {
-    var tag = _.find(this.tags, {title: title})
-    if(!tag) {
-      tag = this.createItem({content_type: "Tag", title: title});
-      this.addItem(tag);
-    }
-    return tag;
-  }
-
   addItems(items, globalOnly = false) {
     super.addItems(items, globalOnly);
 
diff --git a/src/screens/Notes.js b/src/screens/Notes.js
index 346343f9..ea5e9f3f 100644
--- a/src/screens/Notes.js
+++ b/src/screens/Notes.js
@@ -451,8 +451,8 @@ export default class Notes extends Abstract {
 
   _onPressItem = (item: hash) => {
     var run = () => {
-      if(item.conflictOf) {
-        item.conflictOf = null;
+      if(item.conflict_of) {
+        item.conflict_of = null;
       }
 
       this.props.navigator.push({