Merge branch 'develop' into refresh-control-test

status-im · May 3, 2024 · 319a601 · 319a601
2 parents 86d2978 + de29c6f
commit 319a601
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 44 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -145,6 +145,14 @@ android {
         jvmTarget = JavaVersion.VERSION_17
     }
 
+    // https://developer.android.com/studio/projects/install-ndk#vanilla_cmake
+    externalNativeBuild {
+        cmake {
+            // This version must match cmakeVersions inside nix/pkgs/android-sdk/compose.nix
+            version "3.22.1"
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17

diff --git a/nix/pkgs/android-sdk/compose.nix b/nix/pkgs/android-sdk/compose.nix
@@ -16,6 +16,7 @@ androidenv.composeAndroidPackages {
   platformToolsVersion = "33.0.3";
   buildToolsVersions = [ "34.0.0" ];
   platformVersions = [ "34" ];
+  # This version must match cmake version inside android/app/build.gradle
   cmakeVersions = [ "3.22.1" ];
   ndkVersion = "25.2.9519653";
   includeNDK = true;

diff --git a/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs b/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs
@@ -60,7 +60,10 @@
     (conj
      acc
      [rn/view
-      {:style {:background-color colors/primary-50-opa-10 :border-radius 6 :padding-horizontal 3}}
+      {:style {:background-color   colors/primary-50-opa-10
+               :border-radius      6
+               :padding-horizontal 3
+               :margin-top         -3}}
       [rn/text
        {:style    (merge {:color (if (system-text? content-type) quo.colors/black colors/primary-50)}
                          (if (system-text? content-type) typography/font-regular typography/font-medium))

diff --git a/src/status_im/contexts/chat/messenger/messages/content/system/text/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/system/text/view.cljs
@@ -5,5 +5,5 @@
 
 (defn text-content
   [message-data]
-  [rn/view {:accessibility-label :chat-item}
+  [rn/view {:accessibility-label :chat-item :padding-horizontal 12 :padding-vertical 3}
    [old-message/render-parsed-text message-data]])
diff --git a/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs b/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs
@@ -4,6 +4,7 @@
     [react-native.core :as rn]
     [react-native.gesture :as gesture]
     [status-im.common.not-implemented :as not-implemented]
+    [status-im.config :as config]
     [status-im.contexts.communities.actions.airdrop-addresses.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -64,16 +65,17 @@
          :context-tag               {:type           :community
                                      :community-logo logo
                                      :community-name name}}]
-       [quo/drawer-top
-        {:type                :context-tag
-         :context-tag-type    :community
-         :title               (i18n/label :t/airdrop-addresses)
-         :community-name      name
-         :button-icon         :i/info
-         :button-type         :grey
-         :on-button-press     not-implemented/alert
-         :community-logo      logo
-         :customization-color color}])
+       (when config/show-not-implemented-features?
+         [quo/drawer-top
+          {:type                :context-tag
+           :context-tag-type    :community
+           :title               (i18n/label :t/airdrop-addresses)
+           :community-name      name
+           :button-icon         :i/info
+           :button-type         :grey
+           :on-button-press     not-implemented/alert
+           :community-logo      logo
+           :customization-color color}]))
 
      [gesture/flat-list
       {:data                    accounts

diff --git a/src/status_im/contexts/communities/actions/chat/view.cljs b/src/status_im/contexts/communities/actions/chat/view.cljs
@@ -39,18 +39,20 @@
 
 (defn- action-token-requirements
   []
-  {:icon                :i/token
-   :right-icon          :i/chevron-right
-   :accessibility-label :chat-view-token-requirements
-   :on-press            not-implemented/alert
-   :label               (i18n/label :t/view-token-gating)})
+  (when config/show-not-implemented-features?
+    {:icon                :i/token
+     :right-icon          :i/chevron-right
+     :accessibility-label :chat-view-token-requirements
+     :on-press            not-implemented/alert
+     :label               (i18n/label :t/view-token-gating)}))
 
 (defn- action-mark-as-read
   []
-  {:icon                :i/mark-as-read
-   :accessibility-label :chat-mark-as-read
-   :on-press            not-implemented/alert
-   :label               (i18n/label :t/mark-as-read)})
+  (when config/show-not-implemented-features?
+    {:icon                :i/mark-as-read
+     :accessibility-label :chat-mark-as-read
+     :on-press            not-implemented/alert
+     :label               (i18n/label :t/mark-as-read)}))
 
 (defn- action-toggle-muted
   [id muted? muted-till chat-type]
@@ -71,12 +73,13 @@
 
 (defn- action-notification-settings
   []
-  {:icon                :i/notifications
-   :right-icon          :i/chevron-right
-   :accessibility-label :chat-notification-settings
-   :on-press            not-implemented/alert
-   :label               (i18n/label :t/notification-settings)
-   :sub-label           (i18n/label :t/only-mentions)})
+  (when config/show-not-implemented-features?
+    {:icon                :i/notifications
+     :right-icon          :i/chevron-right
+     :accessibility-label :chat-notification-settings
+     :on-press            not-implemented/alert
+     :label               (i18n/label :t/notification-settings)
+     :sub-label           (i18n/label :t/only-mentions)}))
 
 (defn- action-pinned-messages
   [chat-id]
@@ -91,10 +94,11 @@
 
 (defn- action-invite-people
   []
-  {:icon                :i/add-user
-   :accessibility-label :chat-invite-people
-   :on-press            not-implemented/alert
-   :label               (i18n/label :t/invite-people-from-contacts)})
+  (when config/show-not-implemented-features?
+    {:icon                :i/add-user
+     :accessibility-label :chat-invite-people
+     :on-press            not-implemented/alert
+     :label               (i18n/label :t/invite-people-from-contacts)}))
 
 (defn- action-qr-code
   [chat-id]

diff --git a/src/status_im/contexts/profile/contact/actions/view.cljs b/src/status_im/contexts/profile/contact/actions/view.cljs
@@ -3,6 +3,7 @@
             [quo.core :as quo]
             [react-native.core :as rn]
             [status-im.common.not-implemented :as not-implemented]
+            [status-im.config :as config]
             [status-im.constants :as constants]
             [status-im.contexts.profile.contact.add-nickname.view :as add-nickname]
             [status-im.contexts.profile.contact.block-contact.view :as block-contact]
@@ -86,12 +87,13 @@
              :add-divider?        true
              :accessibility-label :remove-nickname
              :danger?             true})
-          {:icon                :i/untrustworthy
-           :label               (i18n/label :t/mark-untrustworthy)
-           :on-press            not-implemented/alert
-           :accessibility-label :mark-untrustworthy
-           :add-divider?        (when-not has-nickname? true)
-           :danger?             true}
+          (when config/show-not-implemented-features?
+            {:icon                :i/untrustworthy
+             :label               (i18n/label :t/mark-untrustworthy)
+             :on-press            not-implemented/alert
+             :accessibility-label :mark-untrustworthy
+             :add-divider?        (when-not has-nickname? true)
+             :danger?             true})
           (when (= constants/contact-request-state-mutual contact-request-state)
             {:icon                :i/remove-user
              :label               (i18n/label :t/remove-contact)

diff --git a/src/status_im/contexts/profile/settings/screens/password/view.cljs b/src/status_im/contexts/profile/settings/screens/password/view.cljs
@@ -3,6 +3,7 @@
             [quo.theme :as quo.theme]
             [status-im.common.biometric.utils :as biometric]
             [status-im.common.not-implemented :as not-implemented]
+            [status-im.config :as config]
             [status-im.constants :as constants]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
@@ -46,12 +47,13 @@
 
 (defn- get-change-password-item
   []
-  {:title       (i18n/label :t/change-password)
-   :on-press    not-implemented/alert
-   :blur?       true
-   :image       :icon
-   :image-props :i/password
-   :action      :arrow})
+  (when config/show-not-implemented-features?
+    {:title       (i18n/label :t/change-password)
+     :on-press    not-implemented/alert
+     :blur?       true
+     :image       :icon
+     :image-props :i/password
+     :action      :arrow}))
 
 (defn- navigate-back
   []

diff --git a/src/status_im/feature_flags.cljs b/src/status_im/feature_flags.cljs
@@ -18,7 +18,8 @@
     ::wallet.assets-modal-manage-tokens  (enabled-in-env? :FLAG_ASSETS_MODAL_MANAGE_TOKENS)
     ::wallet.assets-modal-hide           (enabled-in-env? :FLAG_ASSETS_MODAL_HIDE)
     ::community.edit-account-selection   (enabled-in-env? :FLAG_EDIT_ACCOUNT_SELECTION_ENABLED)
-    ::wallet.contacts                    (enabled-in-env? :FLAG_CONTACTS_ENABLED)}))
+    ::wallet.contacts                    (enabled-in-env? :FLAG_CONTACTS_ENABLED)
+    ::wallet.wallet-connect              (enabled-in-env? :FLAG_WALLET_CONNECT_ENABLED)}))
 
 (defn feature-flags [] @feature-flags-config)