Add deletion of saved addresses

fix: remove wallet graph (#19973)

src/quo/components/links/internal_link_card/community/view.cljs

@@ -9,31 +9,26 @@
     [schema.core :as schema]))
 
 (defn- description-comp
-  [description members-count active-members-count show-members-count?]
-  (let [has-members?        (pos? members-count)
-        has-active-members? (pos? active-members-count)]
-    [rn/view
-     [text/text
-      {:size                :paragraph-2
-       :number-of-lines     3
-       :accessibility-label :description}
-      description]
-     (when show-members-count?
-       [rn/view
-        {:style style/stat-container}
-        (when has-members?
-          [community-stat/view
-           {:value               members-count
-            :icon                :i/members
-            :accessibility-label :members-count
-            :style               {:margin-right 12}
-            :text-size           :paragraph-2}])
-        (when has-active-members?
-          [community-stat/view
-           {:value               active-members-count
-            :icon                :i/active-members
-            :accessibility-label :active-members-count
-            :text-size           :paragraph-2}])])]))
+  [description members-count active-members-count]
+  [rn/view
+   [text/text
+    {:size                :paragraph-2
+     :number-of-lines     3
+     :accessibility-label :description}
+    description]
+   [rn/view {:style style/stat-container}
+    [community-stat/view
+     {:value               members-count
+      :icon                :i/members
+      :accessibility-label :members-count
+      :style               {:margin-right 12}
+      :text-size           :paragraph-2}]
+    (when active-members-count
+      [community-stat/view
+       {:value               active-members-count
+        :icon                :i/active-members
+        :accessibility-label :active-members-count
+        :text-size           :paragraph-2}])]])
 
 (defn- title-comp
   [title]
@@ -79,7 +74,7 @@
 
 (defn- view-internal
   [{:keys [title description loading? icon banner members-count active-members-count
-           on-press size show-members-count?]}]
+           on-press size]}]
   (let [theme (quo.theme/use-theme)]
     [rn/pressable
      {:style               (style/container size theme)
@@ -93,7 +88,7 @@
            [logo-comp icon])
          [title-comp title]]
         (when description
-          [description-comp description members-count active-members-count show-members-count?])
+          [description-comp description members-count active-members-count])
         (when banner
           [thumbnail-comp banner size])])]))
 

src/quo/components/links/internal_link_card/component_spec.cljs

@@ -34,8 +34,7 @@
    :members-count        "20"
    :loading?             false
    :active-members-count "15"
-   :type                 :community
-   :show-members-count?  true})
+   :type                 :community})
 
 (h/describe "Internal link card - Community"
   (h/test "renders with most common props"

src/quo/components/links/internal_link_card/schema.cljs

@@ -18,6 +18,5 @@
       [:active-members-count {:optional true} [:maybe [:or :int :string]]]
       [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
       [:emoji-hash {:optional true} [:maybe :string]]
-      [:size {:optional true} [:maybe :keyword]]
-      [:show-members-count? {:optional true} [:maybe :boolean]]]]]
+      [:size {:optional true} [:maybe :keyword]]]]]
    :any])

src/quo/components/list_items/saved_address/view.cljs

@@ -1,5 +1,6 @@
 (ns quo.components.list-items.saved-address.view
   (:require
+    [clojure.string :as string]
     [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
     [quo.components.icon :as icon]
     [quo.components.list-items.saved-address.style :as style]
@@ -9,32 +10,51 @@
     [react-native.core :as rn]
     [utils.address :as address]))
 
+(def ^:private chains-map
+  {:eth :ethereum
+   :arb :arbitrum
+   :opt :optimism})
+
 (defn- left-container
-  [{:keys [blur? name ens address customization-color]}]
+  [{:keys [blur? ens address customization-color chain-color-map] address-name :name}]
   (let [theme (quo.theme/use-theme)]
     [rn/view {:style style/left-container}
      [wallet-user-avatar/wallet-user-avatar
       {:size                :size-32
-       :full-name           name
+       :full-name           address-name
        :customization-color customization-color}]
      [rn/view {:style style/account-container}
       [text/text
        {:weight :semi-bold
         :size   :paragraph-1
         :style  style/name-text}
-       name]
+       address-name]
       [text/text {:size :paragraph-2}
        [text/text
         {:size   :paragraph-2
          :weight :monospace
          :style  (style/account-address blur? theme)}
+        (map (fn [[chain color]]
+               ^{:key chain}
+               [text/text
+                {:size   :paragraph-2
+                 :weight :monospace
+                 :style  {:color color}} (str (name chain) ":")])
+             chain-color-map)
         (or ens (address/get-shortened-key address))]]]]))
 
 (defn view
-  [{:keys [blur? user-props active-state? customization-color on-press on-options-press]
+  [{:keys [blur? user-props active-state? customization-color on-press on-options-press chains]
     :or   {customization-color :blue
            blur?               false}}]
   (let [theme             (quo.theme/use-theme)
+        chains-vector     (map keyword (string/split chains #":"))
+        chain-color-map   (->> chains-vector
+                               (map (fn [chain-short-keyword]
+                                      (let [chain-full-name (get chains-map chain-short-keyword)]
+                                        {chain-short-keyword (colors/resolve-color chain-full-name
+                                                                                   theme)})))
+                               (into {}))
         [state set-state] (rn/use-state :default)
         active?           (rn/use-ref-atom false)
         timer             (rn/use-ref-atom nil)
@@ -64,7 +84,8 @@
        :name                (:name user-props)
        :ens                 (:ens user-props)
        :address             (:address user-props)
-       :customization-color (or (:customization-color user-props) :blue)}]
+       :customization-color (or (:customization-color user-props) :blue)
+       :chain-color-map     (when chains chain-color-map)}]
      (when on-options-press
        [rn/pressable
         {:accessibility-label :options-button

src/status_im/contexts/chat/messenger/messages/content/status_link_preview/view.cljs

@@ -15,19 +15,14 @@
                   community-icon        :icon
                   community-banner      :banner
                   community-name        :display-name
-                  members-count         :members-count
-                  community-id          :community-id} community
-                 token-gated-not-a-member?             (rf/sub
-                                                        [:communities/token-gated-not-a-member?
-                                                         community-id])]
+                  members-count         :members-count} community]
              ^{:key url}
              [quo/internal-link-card
-              {:type                :community
-               :size                :message
-               :description         community-description
-               :members-count       members-count
-               :title               community-name
-               :banner              (:url community-banner)
-               :icon                (:url community-icon)
-               :on-press            #(rf/dispatch [:universal-links/handle-url url])
-               :show-members-count? token-gated-not-a-member?}])))])))
+              {:type          :community
+               :size          :message
+               :description   community-description
+               :members-count members-count
+               :title         community-name
+               :banner        (:url community-banner)
+               :icon          (:url community-icon)
+               :on-press      #(rf/dispatch [:universal-links/handle-url url])}])))])))

src/status_im/contexts/preview/quo/list_items/saved_address.cljs

@@ -8,7 +8,8 @@
   [(preview/customization-color-option {:key :account-color})
    {:key :blur? :type :boolean}
    {:key :title :type :text}
-   (preview/customization-color-option)])
+   (preview/customization-color-option)
+   {:key :chains :type :text}])
 
 (defn view
   []
@@ -17,7 +18,8 @@
                              :account-color       :flamingo
                              :title               "Alisher Yakupov"
                              :address             "0x21a...49e"
-                             :on-options-press    #(js/alert "Options button pressed!")})]
+                             :on-options-press    #(js/alert "Options button pressed!")
+                             :chains              "eth:opt:arb:"})]
     (fn []
       [preview/preview-container
        {:state                 state

src/status_im/contexts/settings/wallet/saved_addresses/events.cljs

@@ -0,0 +1,20 @@
+(ns status-im.contexts.settings.wallet.saved-addresses.events
+  (:require [taoensso.timbre :as log]
+            [utils.re-frame :as rf]))
+
+(rf/reg-event-fx
+ :wallet/remove-account-success
+ (fn [_ [toast-message _]]
+   {:fx [[:dispatch [:wallet/get-saved-addresses]]
+         [:dispatch-later
+          {:ms       100
+           :dispatch [:wallet/show-account-deleted-toast toast-message]}]]}))
+
+(rf/defn delete-saved-address
+  {:events [:wallet/delete-saved-address]}
+  [_ {:keys [address test? toast-message]}]
+  {:json-rpc/call
+   [{:method     "wakuext_deleteSavedAddress"
+     :params     [address test?]
+     :on-success [:wallet/remove-account-success toast-message]
+     :on-error   #(log/error "Failed to delete saved address" %)}]})

src/status_im/contexts/settings/wallet/saved_addresses/style.cljs

@@ -2,7 +2,8 @@
 
 (def title-container
   {:padding-horizontal 20
-   :margin-top         12})
+   :margin-top         12
+   :margin-bottom      16})
 
 (defn page-wrapper
   [inset-top]

src/status_im/contexts/settings/wallet/saved_addresses/view.cljs

@@ -1,14 +1,18 @@
 (ns status-im.contexts.settings.wallet.saved-addresses.view
   (:require [quo.core :as quo]
+            [quo.foundations.colors :as colors]
             [quo.theme :as quo.theme]
             [react-native.core :as rn]
+            [react-native.platform :as platform]
             [react-native.safe-area :as safe-area]
+            [status-im.common.not-implemented :as not-implemented]
             [status-im.common.resources :as resources]
+            [status-im.config :as config]
             [status-im.contexts.settings.wallet.saved-addresses.style :as style]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
-(defn empty-state
+(defn- empty-state
   []
   (let [theme (quo.theme/use-theme)]
     [quo/empty-state
@@ -17,12 +21,169 @@
       :image           (resources/get-themed-image :sweating-man theme)
       :container-style style/empty-container-style}]))
 
-(defn view
+(defn- option
+  [{:keys [icon label on-press danger? sub-label add-divider? accessibility-label right-icon] :as opt}]
+  (when opt
+    ^{:key label}
+    {:icon                icon
+     :label               label
+     :on-press            on-press
+     :danger?             danger?
+     :sub-label           sub-label
+     :right-icon          right-icon
+     :add-divider?        add-divider?
+     :accessibility-label accessibility-label}))
+
+(defn- remove-account
+  [address account-name customization-color]
+  (rf/dispatch [:hide-bottom-sheet])
+  (rf/dispatch
+   [:show-bottom-sheet
+    {:theme   :dark
+     :content (fn []
+                [:<>
+                 [quo/drawer-top
+                  {:title               (i18n/label :t/remove-saved-address)
+                   :customization-color customization-color}]
+                 [quo/context-tag
+                  {:type                :default
+                   :customization-color customization-color
+                   :size                24
+                   :full-name           account-name
+                   :container-style     {:padding-horizontal 20
+                                         :margin-bottom      16}}]
+                 [quo/text
+                  {:style {:padding-horizontal 20
+                           :margin-bottom      8}}
+                  (i18n/label :t/remove-saved-address-description {:name account-name})]
+                 [quo/bottom-actions
+                  {:actions          :two-actions
+                   :button-one-label (i18n/label :t/remove)
+                   :button-one-props {:on-press (fn []
+                                                  (rf/dispatch [:wallet/delete-saved-address
+                                                                {:address address
+                                                                 :toast-message
+                                                                 (i18n/label :t/saved-address-removed)
+                                                                 :test? false}]))
+                                      :type     :danger}
+                   :button-two-label (i18n/label :t/cancel)
+                   :button-two-props {:on-press #(rf/dispatch [:hide-bottom-sheet])
+                                      :type     :grey}}]])}]))
+
+(defn- options
+  [account-name address customization-color]
+  [(when config/show-not-implemented-features?
+     {:icon                :i/arrow-up
+      :label               (i18n/label :t/send-to-user {:user account-name})
+      :on-press            not-implemented/alert
+      :accessibility-label :send-to-user})
+   (when config/show-not-implemented-features?
+     {:icon                :i/link
+      :right-icon          :i/external
+      :label               (i18n/label :t/view-address-on-website {:website "Etherscan"})
+      :on-press            not-implemented/alert
+      :accessibility-label :view-address-on-etherscan})
+   (when config/show-not-implemented-features?
+     {:icon                :i/link
+      :right-icon          :i/external
+      :label               (i18n/label :t/view-address-on-website {:website "Optimistic"})
+      :on-press            not-implemented/alert
+      :accessibility-label :view-address-on-optimistic})
+   {:icon                :i/share
+    :on-press            #(rf/dispatch
+                           [:open-share
+                            {:options (if platform/ios?
+                                        {:activityItemSources [{:placeholderItem {:type    :text
+                                                                                  :content address}
+                                                                :item            {:default {:type :text
+                                                                                            :content
+                                                                                            address}}
+                                                                :linkMetadata    {:title address}}]}
+                                        {:title     address
+                                         :subject   address
+                                         :message   address
+                                         :isNewTask true})}])
+    :label               (i18n/label :t/share-address)
+    :accessibility-label :share-saved-address}
+   {:icon                :i/qr-code
+    :label               (i18n/label :t/show-address-qr)
+    :on-press            (fn []
+                           (rf/dispatch [:wallet/set-current-viewing-account address])
+                           (rf/dispatch [:open-modal :screen/wallet.share-address {:status :share}]))
+    :accessibility-label :show-address-qr-code}
+   (when config/show-not-implemented-features?
+     {:icon                :i/edit
+      :label               (i18n/label :t/edit-account)
+      :on-press            #(rf/dispatch [:navigate-to :screen/wallet.edit-account])
+      :accessibility-label :edit-saved-address})
+   (when config/show-not-implemented-features?
+     {:icon                :i/delete
+      :label               (i18n/label :t/remove-address)
+      :on-press            #(remove-account address account-name customization-color)
+      :danger?             true
+      :accessibility-label :remove-saved-address
+      :add-divider?        true})])
+
+(defn- sample-options
+  [account-name address customization-color]
+  (keep option (options account-name address customization-color)))
+
+(defn- account-sheet
+  [address account-name customization-color]
+  [quo/action-drawer
+   [(sample-options account-name address customization-color)]])
+
+(defn- on-press-saved-address
+  [{:keys [address account-name ens-name customization-color]}]
+  (rf/dispatch
+   [:show-bottom-sheet
+    {:theme         :dark
+     :selected-item (fn []
+                      [quo/saved-address
+                       {:active-state? false
+                        :user-props    {:name                account-name
+                                        :address             address
+                                        :ens                 ens-name
+                                        :customization-color customization-color}}])
+     :content       (fn []
+                      [account-sheet
+                       address account-name customization-color])}]))
+
+(defn- saved-address
+  [{:keys        [address colorId _chain-short-names _test? ens?]
+    account-name :name}]
+  [quo/saved-address
+   {:on-press   #(on-press-saved-address
+                  {:account-name        account-name
+                   :address             address
+                   :ens-name            (when ens? address)
+                   :customization-color (keyword colorId)})
+    :user-props {:name                account-name
+                 :address             address
+                 :customization-color (keyword colorId)}}])
+
+(defn- header
+  [{:keys [title]}]
+  [quo/divider-label
+   {:container-style {:border-top-color colors/white-opa-5}}
+   title])
+
+(defn- footer
+  []
+  [rn/view {:height 8}])
+
+(defn- navigate-back
+  []
+  (rf/dispatch [:navigate-back]))
+
+(defn- view
   []
   (let [inset-top           (safe-area/get-top)
         customization-color (rf/sub [:profile/customization-color])
-        saved-addresses     []
-        navigate-back       (rn/use-callback #(rf/dispatch [:navigate-back]))]
+        saved-addresses     (rf/sub [:wallet/grouped-saved-addresses])]
+    (rn/use-effect
+     (fn []
+       (rf/dispatch [:wallet/get-saved-addresses])))
     [quo/overlay
      {:type            :shell
       :container-style (style/page-wrapper inset-top)}
@@ -38,5 +199,13 @@
         :right               :action
         :customization-color customization-color
         :icon                :i/add}]]
+     [rn/section-list
+      {:key-fn                         :title
+       :sticky-section-headers-enabled false
+       :render-section-header-fn       header
+       :render-section-footer-fn       footer
+       :sections                       saved-addresses
+       :render-fn                      saved-address
+       :separator                      [rn/view {:style {:height 4}}]}]
      (when-not (seq saved-addresses)
        [empty-state])]))

src/status_im/contexts/wallet/account/view.cljs

@@ -33,11 +33,12 @@
           {:type     :wallet-networks
            :on-press #(rf/dispatch [:wallet/close-account-page])}]
          [quo/account-overview
-          {:current-value       formatted-balance
+          {:container-style     style/account-overview
+           :current-value       formatted-balance
            :account-name        name
            :account             (if watch-only? :watched-address :default)
            :customization-color color}]
-         [quo/wallet-graph {:time-frame :empty}]
+         (when (ff/enabled? ::ff/wallet.graph) [quo/wallet-graph {:time-frame :empty}])
          (when (not watch-only?)
            [quo/wallet-ctas
             {:container-style style/cta-buttons

src/status_im/contexts/wallet/events.cljs

@@ -27,10 +27,16 @@
               :type :positive
               :text (i18n/label :t/account-created {:name (:name account)})}]]]})))
 
+(defn set-current-viewing-account
+  [{:keys [db]} [address]]
+  {:db (assoc-in db [:wallet :current-viewing-account-address] address)})
+
+(rf/reg-event-fx :wallet/set-current-viewing-account set-current-viewing-account)
+
 (rf/reg-event-fx :wallet/navigate-to-account
- (fn [{:keys [db]} [address]]
-   {:db (assoc-in db [:wallet :current-viewing-account-address] address)
-    :fx [[:dispatch [:navigate-to :screen/wallet.accounts address]]]}))
+ (fn [_cofx [address]]
+   {:fx [[:dispatch [:wallet/set-current-viewing-account address]]
+         [:dispatch [:navigate-to :screen/wallet.accounts address]]]}))
 
 (rf/reg-event-fx :wallet/navigate-to-new-account
  (fn [{:keys [db]} [address]]

src/status_im/contexts/wallet/save_address/events.cljs

@@ -29,7 +29,7 @@
 (rf/reg-event-fx
  :wallet/get-saved-addresses-success
  (fn [{:keys [db]} [saved-addresses]]
-   {:db (assoc-in db [:wallet :saved-addresses] saved-addresses)}))
+   {:db (assoc-in db [:wallet :saved-addresses] (group-by :address saved-addresses))}))
 
 (rf/reg-event-fx
  :wallet/get-saved-addresses-error

src/status_im/events.cljs

@@ -28,6 +28,7 @@
     status-im.contexts.onboarding.events
     status-im.contexts.profile.events
     status-im.contexts.profile.settings.events
+    status-im.contexts.settings.wallet.saved-addresses.events
     status-im.contexts.shell.qr-reader.events
     status-im.contexts.shell.share.events
     status-im.contexts.syncing.events
@@ -37,6 +38,7 @@
     status-im.contexts.wallet.common.wizard.events
     status-im.contexts.wallet.effects
     status-im.contexts.wallet.events
+    status-im.contexts.wallet.save-address.events
     status-im.contexts.wallet.send.events
     status-im.contexts.wallet.signals
     status-im.contexts.wallet.swap.events

src/status_im/subs/communities.cljs

@@ -427,19 +427,3 @@
  (fn [[permissions] _]
    (let [all-tokens (apply concat (map :tokens permissions))]
      (boolean (some seq all-tokens)))))
-
-(re-frame/reg-sub
- :communities/token-gated-not-a-member?
- (fn [[_ community-id]]
-   [(re-frame/subscribe [:communities/community community-id])])
- (fn [{:keys [token-permissions joined] :as community}]
-   (let [token-permission-to-become-member-or-admin (->> token-permissions
-                                                         (into {})
-                                                         vals
-                                                         (some (fn [{community-permission-type :type}]
-                                                                 (boolean
-                                                                  (constants/community-role-permissions
-                                                                   community-permission-type)))))]
-     (or joined
-         (and (not joined) (empty? token-permissions) (seq community))
-         (not token-permission-to-become-member-or-admin)))))

src/status_im/subs/wallet/saved_addresses.cljs

@@ -1,5 +1,6 @@
 (ns status-im.subs.wallet.saved-addresses
   (:require
+    [clojure.string :as string]
     [re-frame.core :as rf]))
 
 (rf/reg-sub
@@ -13,3 +14,16 @@
  (fn [wallet [address]]
    (some #(= address (:address %))
          (:saved-addresses wallet))))
+
+(rf/reg-sub
+ :wallet/grouped-saved-addresses
+ :<- [:wallet/saved-addresses]
+ (fn [saved-addresses]
+   (->> saved-addresses
+        vals
+        flatten
+        (sort-by :name)
+        (group-by #(string/upper-case (first (:name %))))
+        (map (fn [[k v]]
+               {:title k
+                :data  v})))))

src/status_im/subs/wallet/saved_addresses_test.cljs

@@ -0,0 +1,25 @@
+(ns status-im.subs.wallet.saved-addresses-test
+  (:require [clojure.test :refer [is testing]]
+            [re-frame.db :as rf-db]
+            [test-helpers.unit :as h]
+            [utils.re-frame :as rf]))
+
+(def saved-addresses-data
+  [{:address "0x0" :colorId "blue" :chainShortNames "eth:" :isTest false :name "Alice's address"}
+   {:address "0x1" :colorId "purple" :chainShortNames "eth:" :isTest false :name "Bob's address"}])
+
+(def grouped-saved-addresses-data
+  [{:title "A"
+    :data
+    [{:address "0x0" :colorId "blue" :chainShortNames "eth:" :isTest false :name "Alice's address"}]}
+   {:title "B"
+    :data
+    [{:address "0x1" :colorId "purple" :chainShortNames "eth:" :isTest false :name "Bob's address"}]}])
+
+(h/deftest-sub :wallet/grouped-saved-addresses
+  [sub-name]
+  (testing "returns data with prod"
+    (swap! rf-db/app-db assoc-in [:wallet :saved-addresses] saved-addresses-data)
+    (is
+     (= grouped-saved-addresses-data
+        (rf/sub [sub-name])))))

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.179.13",
-    "commit-sha1": "f3f48654f54aebbb4949129f930fef648d8da8f9",
-    "src-sha256": "09gcr6fgx6v4qdp83w0n2ynnlvwjqid477jgpqjk57l5wfrv2raq"
+    "version": "add-emoji-to-saved-addresses",
+    "commit-sha1": "5c1ae90fa682ffb236f35b71c4d2911455bea8ce",
+    "src-sha256": "12xfsxdyclz8mx4qm6lywcbzqkxmrspni44450cqsa5qspdhdrxq"
 }

translations/en.json

@@ -2613,5 +2613,11 @@
     "scanning-for-activity": "Scanning for activity...",
     "send-community-link": "Send community link",
     "at-least-one-network-must-be-activated": "At least 1 network must be activated",
-    "status-is-a-secure-messaging-app": "Status is a secure messaging app, crypto wallet and web3 browser built with the state of the art technology"
+    "status-is-a-secure-messaging-app": "Status is a secure messaging app, crypto wallet and web3 browser built with the state of the art technology",
+    "send-to-user": "Send to {{user}}",
+    "view-address-on-website": "View address on {{website}}",
+    "saved-address-removed": "Saved address removed",
+    "remove-address": "Remove address",
+    "remove-saved-address-description": "Transaction history relating to this address will no longer be labelled ‘{{name}}’.",
+    "remove-saved-address": "Remove saved address"
 }