Feature/clean metro logs remove old wallet UI (#18165)

status-im · Dec 13, 2023 · 0eb424b · 0eb424b
1 parent cc4a732
commit 0eb424b
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 57 deletions.
diff --git a/src/status_im/ethereum/subscriptions.cljs b/src/status_im/ethereum/subscriptions.cljs
@@ -69,10 +69,10 @@
 
 (rf/defn new-wallet-event
   [cofx {:keys [type blockNumber accounts] :as event}]
-  (log/info "[wallet-subs] new-wallet-event"
-            "event-type"  type
-            "blockNumber" blockNumber
-            "accounts"    accounts)
+  (log/debug "[wallet-subs] new-wallet-event"
+             "event-type"  type
+             "blockNumber" blockNumber
+             "accounts"    accounts)
   (case type
     "new-transfers"                            (new-transfers cofx blockNumber accounts)
     "recent-history-fetching"                  (recent-history-fetching-started cofx accounts)
@@ -85,4 +85,4 @@
     "wallet-get-collectibles-details-done"     {:fx [[:dispatch
                                                       [:wallet/get-collectible-details-done
                                                        event]]]}
-    (log/warn ::unknown-wallet-event :type type :event event)))
+    (log/debug ::unknown-wallet-event :type type :event event)))
diff --git a/src/status_im/wallet/core.cljs b/src/status_im/wallet/core.cljs
@@ -1153,26 +1153,18 @@
         #(async-storage/set-item! :invalid-ens-name-seen true)))))
   nil)
 
-(re-frame/reg-fx
- ::enable-local-notifications
- (fn []
-   (native-module/start-local-notifications)))
-
 (rf/defn initialize-wallet
   {:events [:wallet-legacy/initialize-wallet]}
   [{:keys [db] :as cofx} accounts tokens custom-tokens
    favourites scan-all-tokens? new-account?]
   (rf/merge
    cofx
-   {:db                          (assoc db
-                                        :profile/wallet-accounts
-                                        (rpc->accounts accounts))
-    ;; NOTE: Local notifications should be enabled only after wallet was started
-    ::enable-local-notifications nil
-    :dispatch-n                  [(when (or (not (utils.mobile-sync/syncing-allowed? cofx))
-                                            (chain/binance-chain? db))
-                                    [:transaction/get-fetched-transfers])]
-    :dispatch                    [:wallet/get-accounts-success accounts]}
+   {:db         (assoc db
+                       :profile/wallet-accounts
+                       (rpc->accounts accounts))
+    :dispatch-n [(when (or (not (utils.mobile-sync/syncing-allowed? cofx))
+                           (chain/binance-chain? db))
+                   [:transaction/get-fetched-transfers])]}
    (check-invalid-ens)
    (initialize-tokens tokens custom-tokens)
    (initialize-favourites favourites)

diff --git a/src/status_im2/contexts/profile/login/effects.cljs b/src/status_im2/contexts/profile/login/effects.cljs
@@ -9,3 +9,7 @@
    ;;"node.login" signal will be triggered as a callback
    (native-module/login-account
     (assoc (profile.config/login) :keyUid key-uid :password hashed-password))))
+
+(rf/reg-fx :effects.profile/enable-local-notifications
+ (fn []
+   (native-module/start-local-notifications)))
diff --git a/src/status_im2/contexts/profile/login/events.cljs b/src/status_im2/contexts/profile/login/events.cljs
@@ -112,31 +112,29 @@
         current-network-config                      (get networks current-network)
         network-id                                  (str (get-in networks
                                                                  [current-network :config :NetworkId]))]
-    (rf/merge cofx
-              (cond-> {:json-rpc/call [{:method     "wakuext_startMessenger"
-                                        :on-success #(re-frame/dispatch [:messenger-started %])
-                                        :on-error   #(log/error "failed to start messenger")}]
-                       :wallet-legacy/initialize-transactions-management-enabled nil
-                       :wallet-legacy/initialize-wallet
-                       [network-id
-                        current-network-config
-                        (fn [accounts tokens custom-tokens favourites]
-                          (re-frame/dispatch [:wallet-legacy/initialize-wallet
-                                              accounts tokens custom-tokens favourites]))]
-                       :check-eip1559-activation {:network-id network-id}}
-                (not (:universal-links/handling db))
-                (assoc :effects.chat/open-last-chat (get-in db [:profile/profile :key-uid]))
-                notifications-enabled?
-                (assoc :effects/push-notifications-enable nil))
-              (contacts/initialize-contacts)
-              (browser/initialize-browser)
-              (mobile-network/on-network-status-change)
-              (group-chats/get-group-chat-invitations)
-              (profile.settings.events/get-profile-picture)
-              (profile.settings.events/change-preview-privacy)
-              (link-preview/request-link-preview-whitelist)
-              (visibility-status-updates-store/fetch-visibility-status-updates-rpc)
-              (switcher-cards-store/fetch-switcher-cards-rpc))))
+    (rf/merge
+     cofx
+     (cond-> {:json-rpc/call                              [{:method     "wakuext_startMessenger"
+                                                            :on-success #(re-frame/dispatch
+                                                                          [:messenger-started %])
+                                                            :on-error   #(log/error
+                                                                          "failed to start messenger")}]
+              :check-eip1559-activation                   {:network-id network-id}
+              :effects.profile/enable-local-notifications nil
+              :dispatch-n                                 [[:wallet/get-accounts]]}
+       (not (:universal-links/handling db))
+       (assoc :effects.chat/open-last-chat (get-in db [:profile/profile :key-uid]))
+       notifications-enabled?
+       (assoc :effects/push-notifications-enable nil))
+     (contacts/initialize-contacts)
+     (browser/initialize-browser)
+     (mobile-network/on-network-status-change)
+     (group-chats/get-group-chat-invitations)
+     (profile.settings.events/get-profile-picture)
+     (profile.settings.events/change-preview-privacy)
+     (link-preview/request-link-preview-whitelist)
+     (visibility-status-updates-store/fetch-visibility-status-updates-rpc)
+     (switcher-cards-store/fetch-switcher-cards-rpc))))
 
 (rf/defn messenger-started
   {:events [:messenger-started]}

diff --git a/src/status_im2/contexts/quo_preview/settings/reorder_item.cljs b/src/status_im2/contexts/quo_preview/settings/reorder_item.cljs
@@ -8,8 +8,7 @@
 (def mock-data
   [{:id   1
     :type types/item
-    :data {:on-press   (println "pressed")
-           :image      (resources/get-mock-image :diamond)
+    :data {:image      (resources/get-mock-image :diamond)
            :image-size 21
            :right-icon :i/world
            :title      "Trip to Bahamas"}}

diff --git a/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs
@@ -33,10 +33,6 @@
          (assoc :test-ID             stack-id
                 :icon                icon
                 :icon-color-anim     icon-color
-                ;NOTE temporary use of on long press while we support old wallet
-                :on-long-press       #(when (= stack-id :wallet-stack)
-                                        (swap! state/load-new-wallet? not)
-                                        (animation/bottom-tab-on-press stack-id true))
                 :on-press            #(animation/bottom-tab-on-press stack-id true)
                 :accessibility-label (str (name stack-id) "-tab")
                 :customization-color customization-color))]))

diff --git a/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs b/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs
@@ -3,7 +3,6 @@
     [quo.theme :as quo.theme]
     [react-native.reanimated :as reanimated]
     [status-im.ui.screens.browser.stack :as browser.stack]
-    [status-im.ui.screens.wallet.accounts.views :as wallet.accounts]
     [status-im2.contexts.chat.home.view :as chat]
     [status-im2.contexts.communities.home.view :as communities]
     [status-im2.contexts.shell.jump-to.components.home-stack.style :as style]
@@ -32,10 +31,7 @@
    (case stack-id
      :communities-stack [:f> communities/view]
      :chats-stack       [:f> chat/view]
-     ;NOTE temporary while we support old wallet
-     :wallet-stack      (if @state/load-new-wallet?
-                          [wallet-new/view]
-                          [wallet.accounts/accounts-overview-old])
+     :wallet-stack      [wallet-new/view]
      :browser-stack     [browser.stack/browser-stack]
      [:<>])])
 

diff --git a/src/status_im2/contexts/shell/jump_to/state.cljs b/src/status_im2/contexts/shell/jump_to/state.cljs
@@ -17,5 +17,3 @@
 (def load-chats-stack? (reagent/atom false))
 (def load-wallet-stack? (reagent/atom false))
 (def load-browser-stack? (reagent/atom false))
-;NOTE temporary while we support old wallet
-(def load-new-wallet? (reagent/atom true))