Merge pull request #9407 from brave/fix/9308-followup

follow ups to fix for #9308

Author: diracdeltas

app/sessionStore.js

@@ -296,6 +296,10 @@ module.exports.cleanAppData = (data, isShutdown) => {
   if (data.dragData) {
     delete data.dragData
   }
+  if (data.sync) {
+    // clear sync site cache
+    data.sync.objectsById = {}
+  }
   const clearSiteSettings = isShutdown && getSetting(settings.SHUTDOWN_CLEAR_SITE_SETTINGS) === true
   if (clearSiteSettings) {
     data.siteSettings = {}

app/sync.js

@@ -95,6 +95,11 @@ const appStoreChangeCallback = function (diffs) {
     const entry = state.getIn(statePath)
     const isSite = type === 'sites'
 
+    if (action === writeActions.CREATE && entry && entry.get('skipSync')) {
+      // Don't re-create objects that were fetched by sync
+      return
+    }
+
     if (isSite && action === writeActions.DELETE && !entry) {
       // If we deleted the site, it is no longer availble in appState.
       // Find the corresponding objectId using the sync cache