disconnect event

doc/STARTING_GUIDE.md

@@ -10,13 +10,6 @@ make shell TARGET=android
 ```
 This step will take a while the first time as it will download all dependencies.
 
-To build the app, your can simply run on of the following:
-```
-make release-android
-make release-ios
-```
-For more `make` targets run `make help`.
-
 # Development
 
 There are three steps necessary to start development, in this case for Android:
@@ -28,6 +21,18 @@ There are three steps necessary to start development, in this case for Android:
 The first two will continue watching for changes and keep re-building the app. They need to be ready first.
 The last one will exit once the app is up and ready.
 
+You need to have your emulator or real devices running and visible to adb, before you run `make run-android`.
+
+# Build release
+
+To build the app, your can simply run on of the following:
+```
+make release-android
+make release-ios
+```
+
+For more `make` targets run `make help`.
+
 # Updating Dependencies
 
 * `make nix-update-pods` - iOS CocoaPods dependencies (updates `ios/Podfile` and `ios/Podfile.loc`)

src/status_im/ethereum/json_rpc.cljs

@@ -44,7 +44,7 @@
    "waku_getSymKey" {}
    "waku_markTrustedPeer" {}
    "wakuext_post" {}
-   "wakuext_requestAllHistoricMessages" {}
+   "wakuext_requestAllHistoricMessages2" {}
    "wakuext_editMessage" {}
    "wakuext_deleteMessageAndSend" {}
    "wakuext_fillGaps" {}

src/status_im/mailserver/core.cljs

@@ -201,15 +201,15 @@
          (not (:mailserver/current-request db)))
     (when-let [mailserver (get-mailserver-when-ready cofx)]
       {:db (assoc db :mailserver/current-request true)
-       ::json-rpc/call [{:method "wakuext_requestAllHistoricMessages"
+       ::json-rpc/call [{:method "wakuext_requestAllHistoricMessages2"
                          :params []
                          :js-response true
                          :on-success #(do
                                         (log/info "fetched historical messages")
                                         (re-frame/dispatch [::request-success %]))
-                         :on-failure #(do
-                                        (log/error "failed retrieve historical messages" %)
-                                        (re-frame/dispatch [::disconnect-from-mailserver]))}]})))
+                         :on-error #(do
+                                      (log/error "failed retrieve historical messages" %)
+                                      (re-frame/dispatch [::disconnect-from-mailserver]))}]})))
 
 (fx/defn connected-to-mailserver
   [{:keys [db] :as cofx}]

status-go-version.json

@@ -4,6 +4,6 @@
     "owner": "status-im",
     "repo": "status-go",
     "version": "bug/dont-overwrite-send-status",
-    "commit-sha1": "c0b26aaa355c5aae03c68e9c57a2751d6675e5da",
-    "src-sha256": "11fw9xyandqknkwx5yzyddsrd2k847i507rpjms1y04f5kgh3cwv"
+    "commit-sha1": "0852e0aea1d930330f825ae7b8461bdd8bd2b244",
+    "src-sha256": "0nx2gcyifk28dwwrafmxs6yizj7v96wnx45zifq5vxjrkwvj849l"
 }