remove publisher

status-im · Feb 14, 2022 · 9688b58 · 9688b58
1 parent 04290a7
commit 9688b58
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 54 deletions.
diff --git a/src/status_im/mailserver/core.cljs b/src/status_im/mailserver/core.cljs
@@ -122,7 +122,7 @@
             (multiaccounts.update/multiaccount-update :use-mailservers? use-mailservers? {})
             (if use-mailservers?
               ;; TODO: fixme
-              true ;(connect-to-mailserver)
+              (disconnect-from-mailserver)
               (disconnect-from-mailserver))))
 
 (defonce showing-connection-error-popup? (atom false))
@@ -149,9 +149,6 @@
                                                preferred-mailserver]))
                                  :style   "default"}]}))
 
-(defn check-connection! []
-  (re-frame/dispatch [:mailserver/check-connection-timeout]))
-
 (fx/defn retry-next-messages-request
   {:events [:mailserver.ui/retry-request-pressed]}
   [{:keys [db] :as cofx}]
@@ -369,9 +366,9 @@
               (multiaccounts.update/multiaccount-update
                :pinned-mailservers (dissoc pinned-mailservers current-fleet)
                {})
-              (dismiss-connection-error false)
+              (dismiss-connection-error false))))
               ;; TODO: fixme
-              true)))
+;              true)))
               ;(change-mailserver))))
 
 (fx/defn pin

diff --git a/src/status_im/multiaccounts/logout/core.cljs b/src/status_im/multiaccounts/logout/core.cljs
@@ -27,7 +27,6 @@
               (when should-send-metrics?
                 (anon-metrics/stop-transferring))
               (keychain/save-auth-method key-uid auth-method)
-              (transport/stop-whisper)
               (wallet/clear-timeouts)
               (init/initialize-app-db))))
 

diff --git a/src/status_im/transport/core.cljs b/src/status_im/transport/core.cljs
@@ -6,7 +6,6 @@
             [status-im.pairing.core :as pairing]
             [status-im.utils.fx :as fx]
             [status-im.utils.handlers :as handlers]
-            [status-im.utils.publisher :as publisher]
             status-im.transport.shh
             [taoensso.timbre :as log]
             [status-im.utils.universal-links.core :as universal-links]))
@@ -66,10 +65,4 @@
                      (add-custom-mailservers mailservers))}
             (fetch-node-info-fx)
             (pairing/init)
-            (publisher/start-fx)
             (universal-links/process-stored-event)))
-
-(fx/defn stop-whisper
-  "Stops whisper protocol"
-  [cofx]
-  (publisher/stop-fx cofx))
diff --git a/src/status_im/utils/publisher.cljs b/src/status_im/utils/publisher.cljs
diff --git a/status-go-version.json b/status-go-version.json
@@ -4,6 +4,6 @@
     "owner": "status-im",
     "repo": "status-go",
     "version": "bug/dont-overwrite-send-status",
-    "commit-sha1": "3bd60dd4f8d3b2d53de3b2938f5a7f4986ea7000",
-    "src-sha256": "1jz7v57630i0b7v3gs9w0crbgz4nhjkx85m4b8sv5rc158yjfrsk"
+    "commit-sha1": "400419583c3f097b4f4fa45b107b5ecb137bfc26",
+    "src-sha256": "0p6q79nvlgr52p6hhsjzfrgjnvgvgdj259w6agjfilg2j0vgsi99"
 }