Merge pull request #5721 from status-im/fix/5571-fix-blank-screen-on-new-account

Always define request-permissions

modules/react-native-status/desktop/CMakeLists.txt

@@ -37,7 +37,7 @@ ExternalProject_Add(StatusGo_ep
   PREFIX ${StatusGo_PREFIX}
   SOURCE_DIR ${StatusGo_SOURCE_DIR}
   GIT_REPOSITORY https://github.com/status-im/status-go.git
-  GIT_TAG develop-g19b53030
+  GIT_TAG v0.13.1
   BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB}
   CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${CONFIGURE_SCRIPT} ${GO_ROOT_PATH} ${StatusGo_ROOT} ${StatusGo_SOURCE_DIR}
   BUILD_COMMAND ""

src/status_im/notifications/core.cljs

@@ -13,7 +13,7 @@
 
 (when-not platform/desktop?
 
-  (def firebase (object/get rn/react-native-firebase "default"))
+  (def firebase (object/get rn/react-native-firebase "default")))
 
 ;; NOTE: Only need to explicitly request permissions on iOS.
 (defn request-permissions []
@@ -28,6 +28,8 @@
            (log/debug "notifications-denied")
            (re-frame/dispatch [:notifications/request-notifications-denied {}]))))))
 
+(when-not platform/desktop?
+
   (defn get-fcm-token []
     (-> (.getToken (.messaging firebase))
         (.then (fn [x]
@@ -158,3 +160,4 @@
         (handle-push-notification {:from from
                                    :to   to}
                                   cofx)))))
+