[#12731] Blank space in place of 1-1 chat with a blocked user on the home screen

Signed-off-by: andrey <motor4ik@gmail.com>
(cherry picked from commit cd30a04626)

VERSION

@@ -1 +1 @@
-1.16.0
+1.17.0

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotificationHelper.java

@@ -106,7 +106,9 @@ public class PushNotificationHelper {
         //flags in this link:
         //https://stackoverflow.com/questions/52390129/android-intent-setflags-issue
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.setData(Uri.parse(deepLink));
+        if (deepLink != null) {
+            intent.setData(Uri.parse(deepLink));
+        }
         return intent;
     }
 

src/status_im/contact/block.cljs

@@ -39,6 +39,7 @@
            cofx
            {:db (-> db
                     (update :chats dissoc public-key)
+                    (update :chats-home-list disj public-key)
                     (assoc-in [:contacts/contacts public-key :added] false))}
            fxs)))
 

src/status_im/node/core.cljs

@@ -113,8 +113,8 @@
                                  (into (pick-nodes 2
                                                    (vals (:whisper current-fleet)))
                                        (vals (:static current-fleet))))
-                             :WakuNodes wakuv2-nodes
+                             :RelayNodes wakuv2-nodes
-                             :WakuStoreNodes wakuv2-nodes
+                             :StoreNodes wakuv2-nodes
                              :RendezvousNodes    (if wakuv2-enabled [] rendezvous-nodes)})
 
       :always

src/status_im/signals/core.cljs

@@ -47,7 +47,7 @@
   [{:keys [db]} peer-stats]
   (let [previous-stats (:peer-stats db)]
     {:db (assoc db :peer-stats peer-stats
-                :peers-count (count (:Peers peer-stats)))}))
+                :peers-count (count (:peers peer-stats)))}))
 
 (fx/defn process
   {:events [:signals/signal-received]}

src/status_im/subs.cljs

@@ -482,7 +482,7 @@
    ;; then fetch connectivity status from
    ;; peer-stats (populated from "wakuv2.peerstats" status-go signal)
    ;; Otherwise use peers-count fetched from "discovery.summary" signal
-   (if wakuv2-flag (not (:IsOnline peer-stats)) (zero? peers-count))))
+   (if wakuv2-flag (not (:isOnline peer-stats)) (zero? peers-count))))
 
 (re-frame/reg-sub
  :offline?
@@ -861,7 +861,11 @@
  :<- [::chats]
  :<- [:chats-home-list]
  (fn [[chats active-chats]]
-   (map #(get chats %) active-chats)))
+   (reduce #(if-let [item (get chats %2)]
+              (conj %1 item)
+              %1)
+           []
+           active-chats)))
 
 (re-frame/reg-sub
  :chat-by-id

src/status_im/ui/screens/home/views/inner_item.cljs

@@ -76,7 +76,9 @@
      (not (and content content-type))
      [preview-label :t/no-messages]
 
-     (and (= constants/content-type-text content-type)
+     (and (or (= constants/content-type-text content-type)
+              (= constants/content-type-emoji content-type)
+              (= constants/content-type-command content-type))
           (not (string/blank? (:text content))))
      (if (string/blank? (:parsed-text content))
        [react/text-class {:style               styles/last-message-text

src/status_im/ui/screens/signing/views.cljs

@@ -443,7 +443,7 @@
             [amount-item prices wallet-currency amount amount-error display-symbol fee-display-symbol prices-loading?])
           [separator]
           [fee-item prices wallet-currency fee-display-symbol fee gas-error gas-error-state prices-loading?]
-          (when management-enabled?
+          (when (and management-enabled? (not keycard-multiaccount?))
             [advanced-item])
           (when (= :gas-is-set gas-error-state)
             [react/text {:style {:color colors/gray :margin-horizontal 32 :text-align :center}}

src/status_im/ui/screens/wallet/transactions/views.cljs

@@ -39,7 +39,7 @@
   [{:keys [label contact address contact-accessibility-label
            currency-text amount-text
            time-formatted on-touch-fn type hash]}
-   _ _ {:keys [keycard-account? transactions-management-enabled?]}]
+   _ _ {:keys [keycard-account?]}]
   [:<>
    [quo/list-item
     (merge
@@ -60,7 +60,9 @@
                      time-formatted)
       :chevron             true}
      (when type (transaction-type->icon (keyword type))))]
-   (when (and transactions-management-enabled?
+   ;; Disabling for now as we have added nonce which is more reliable, until we
+   ;; address the ux issues
+   (when (and false
               (not keycard-account?)
               (= type :pending))
      [react/view {:flex-direction :row :padding 16 :justify-content :space-between}
@@ -120,7 +122,6 @@
   (let [fetching-recent-history? @(re-frame/subscribe [:wallet/fetching-recent-tx-history? address])
         fetching-more-history? @(re-frame/subscribe [:wallet/fetching-tx-history? address])
         keycard-account? @(re-frame/subscribe [:multiaccounts/keycard-account?])
-        transactions-management-enabled? @(re-frame/subscribe [:wallet/transactions-management-enabled?])
         custom-rpc-node? @(re-frame/subscribe [:custom-rpc-node])
         non-archival-rpc-node? @(re-frame/subscribe [:wallet/non-archival-node])
         all-fetched? @(re-frame/subscribe [:wallet/tx-history-fetched? address])
@@ -141,8 +142,7 @@
      [list/section-list
       {:sections    transaction-history-sections
        :key-fn      :hash
-       :render-data {:keycard-account?                 keycard-account?
+       :render-data {:keycard-account? keycard-account?}
-                     :transactions-management-enabled? transactions-management-enabled?}
        :render-fn   render-transaction
        :empty-component
        [react/i18n-text {:style styles/empty-text

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.89.11",
+    "version": "v0.89.13",
-    "commit-sha1": "23308d7e8c4b7f5c85bffe870ba92010a3784dcb",
+    "commit-sha1": "b79d68c69684f754ea705469c552485905f58e32",
-    "src-sha256": "0zlbzys7g1v3sr67l7fq85mhsk58gkplx8ci7lr5imk9cbciarlx"
+    "src-sha256": "10h2y9kyahpfns4kfjqzayqfb7fwq94lmncp47snbcrwj03vaanq"
 }