Merge branch 'develop' into bugfix/21616

alwx · web-flow · commit 5c86b64ffd1e · 2025-02-13T13:08:32.000+01:00
diff --git a/nix/status-go/source.nix b/nix/status-go/source.nix
@@ -13,8 +13,8 @@ let
     repo = "status-go";
     rev = "unknown";
     shortRev = rev;
-    rawVersion = "develop";
-    cleanVersion = rawVersion;
+    version = "unknown";
+    cleanVersion = version;
     goPackagePath = "github.com/${owner}/${repo}";
     # We use builtins.path so that we can name the resulting derivation,
     # Normally the name would not be deterministic, taken from the checkout directory.
@@ -43,7 +43,6 @@ let
     inherit (versionJSON) owner repo version;
     rev = versionJSON.commit-sha1;
     shortRev = strings.substring 0 7 rev;
-    rawVersion = versionJSON.version;
     cleanVersion = lib.sanitizeVersion versionJSON.version;
     # Need to pretend this is from status-im to let Go build it.
     goPackagePath = "github.com/status-im/${repo}";
diff --git a/src/quo/components/empty_state/empty_state/styles.cljs b/src/quo/components/empty_state/empty_state/styles.cljs
@@ -35,4 +35,4 @@
 (def image-placeholder
   {:width            80
    :height           80
-   :background-color colors/danger})
+   :background-color colors/danger-50})
diff --git a/src/quo/components/inputs/input/style.cljs b/src/quo/components/inputs/input/style.cljs
@@ -31,7 +31,7 @@
        :placeholder  (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 theme)
        :text         (colors/theme-colors colors/neutral-100 colors/white theme)}
       :error
-      {:border-color (colors/theme-colors colors/danger-opa-40 colors/danger-opa-40 theme)
+      {:border-color colors/danger-50-opa-40
        :placeholder  (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
        :text         (colors/theme-colors colors/neutral-100 colors/white theme)}
       :disabled
@@ -48,7 +48,7 @@
        :placeholder  (colors/theme-colors colors/neutral-30 colors/neutral-60 theme)
        :text         (colors/theme-colors colors/neutral-100 colors/white theme)}
       :error
-      {:border-color (colors/theme-colors colors/danger-opa-40 colors/danger-opa-40 theme)
+      {:border-color colors/danger-50-opa-40
        :placeholder  (colors/theme-colors colors/neutral-40 colors/white-opa-40 theme)
        :text         (colors/theme-colors colors/neutral-100 colors/white theme)}
       :disabled
diff --git a/src/quo/components/keycard/component_spec.cljs b/src/quo/components/keycard/component_spec.cljs
@@ -4,11 +4,7 @@
     [test-helpers.component :as h]))
 
 (h/describe "keycard component"
-  (h/test "Render of keycard component when: holder-name prop is not set"
-    (h/render [keycard/keycard])
-    (h/is-truthy (h/get-by-translation-text :t/empty-keycard)))
-
-  (h/test "Render of keycard component when: holder-name prop is set"
-    (let [holder-name "Alisha"]
+  (let [holder-name "Alisha"]
+    (h/test "Render of keycard component when: holder-name prop is set"
       (h/render [keycard/keycard {:holder-name holder-name}])
       (h/is-truthy (h/get-by-translation-text :t/user-keycard {:name holder-name})))))
diff --git a/src/quo/components/keycard/style.cljs b/src/quo/components/keycard/style.cljs
@@ -6,40 +6,28 @@
 (def keycard-chip-height 28)
 
 (defn card-container
-  [locked? theme]
+  [locked? theme blur?]
   {:overflow         :hidden
    :height           keycard-height
    :align-items      :flex-start
    :justify-content  :space-between
    :border-width     1
-   :border-color     (if locked?
+   :border-color     (if (or locked? blur?)
                        colors/white-opa-5
                        (colors/theme-colors colors/neutral-20 colors/neutral-80 theme))
    :border-style     :solid
    :border-radius    16
    :padding          16
    :background-color (if locked?
-                       (colors/theme-colors colors/danger colors/danger-opa-40 theme)
-                       (colors/theme-colors colors/neutral-5 colors/neutral-90 theme))})
+                       (colors/theme-colors colors/danger-50 colors/danger-50-opa-40 theme)
+                       colors/keycard-color)})
 
 (defn keycard-logo
   [locked? theme]
   {:tint-color (if locked?
                  colors/white
                  (colors/theme-colors colors/neutral-100 colors/white theme))})
 
-(defn keycard-watermark
-  [locked? theme]
-  {:position   :absolute
-   :tint-color (if locked?
-                 colors/white-opa-5
-                 (colors/theme-colors colors/neutral-100 colors/white theme))
-   :align-self :center
-   :height     280.48
-   :transform  [{:rotate "-30deg"} {:translate-y -30}]
-   :opacity    (when-not locked? 0.02)
-   :z-index    1})
-
 (def keycard-chip
   {:height   keycard-chip-height
    :position :absolute
diff --git a/src/quo/components/keycard/view.cljs b/src/quo/components/keycard/view.cljs
@@ -1,5 +1,6 @@
 (ns quo.components.keycard.view
   (:require
+    [clojure.string :as string]
     [quo.components.keycard.style :as style]
     [quo.components.tags.tag :as tag]
     [quo.foundations.colors :as colors]
@@ -14,29 +15,24 @@
   - :locked? - Boolean to specify whether the keycard is locked or not
   - :theme :light/:dark
   "
-  [{:keys [holder-name locked?]}]
-  (let [theme (quo.theme/use-theme)
-        label (if holder-name
-                (i18n/label :t/user-keycard {:name holder-name})
-                (i18n/label :t/empty-keycard))]
-    [rn/view {:style (style/card-container locked? theme)}
+  [{:keys [holder-name locked? blur?]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style (style/card-container locked? theme blur?)}
      [rn/image
       {:source (resources/get-image :keycard-logo)
        :style  (style/keycard-logo locked? theme)}]
      [rn/image
       {:source (resources/get-image
                 (if (or locked? (= :dark theme)) :keycard-chip-dark :keycard-chip-light))
        :style  style/keycard-chip}]
-     [rn/image
-      {:source (resources/get-image :keycard-watermark)
-       :style  (style/keycard-watermark locked? theme)}]
-     [tag/tag
-      {:size                32
-       :type                (when locked? :icon)
-       :label               label
-       :labelled?           true
-       :blurred?            true
-       :resource            (when locked? :i/locked)
-       :accessibility-label :holder-name
-       :icon-color          colors/white-70-blur
-       :override-theme      (when locked? :dark)}]]))
+     (when-not (string/blank? holder-name)
+       [tag/tag
+        {:size                32
+         :type                (when locked? :icon)
+         :label               (i18n/label :t/user-keycard {:name holder-name})
+         :labelled?           true
+         :blurred?            true
+         :resource            (when locked? :i/locked)
+         :accessibility-label :holder-name
+         :icon-color          colors/white-70-blur
+         :override-theme      (when locked? :dark)}])]))
diff --git a/src/quo/foundations/colors.cljs b/src/quo/foundations/colors.cljs
@@ -195,17 +195,12 @@
 (def success-60-opa-30 (alpha success-60 0.3))
 (def success-60-opa-40 (alpha success-60 0.4))
 
-;;;;Danger
-(def danger "#E95460")
-
-;; Danger with transparency
-(def danger-opa-40 (alpha danger 0.4))
-
 ;;Solid
 (def danger-50 "#E95460")
 (def danger-60 "#BA434D")
 
 (def system-yellow "#FFD60A")
+(def keycard-color "#FF6400")
 
 ;;50 with transparency
 (def danger-50-opa-0 (alpha danger-50 0))
diff --git a/src/status_im/contexts/keycard/error/view.cljs b/src/status_im/contexts/keycard/error/view.cljs
@@ -33,7 +33,7 @@
        :description      :text
        :description-text description}]
      [rn/view {:style {:margin-horizontal 20}}
-      [quo/keycard {:holder-name ""}]
+      [quo/keycard {:blur? true}]
       [quo/section-label
        {:section (i18n/label :t/what-you-can-do) :container-style {:padding-vertical 8}}]
       (if (= error :keycard/error.keycard-empty)
diff --git a/src/status_im/contexts/keycard/manage/profile_keys/view.cljs b/src/status_im/contexts/keycard/manage/profile_keys/view.cljs
@@ -27,7 +27,7 @@
       {:title profile-name}]
      [rn/view {:style {:margin-horizontal 20}}
       [rn/view {:style {:padding-top 8 :padding-bottom 20}}
-       [quo/keycard {:holder-name ""}]]
+       [quo/keycard {:blur? true}]]
       [quo/section-label
        {:section (i18n/label :t/what-you-can-do) :container-style {:padding-vertical 8}}]
       [quo/settings-item
diff --git a/src/status_im/contexts/keycard/migrate/profile_keys/view.cljs b/src/status_im/contexts/keycard/migrate/profile_keys/view.cljs
@@ -17,7 +17,7 @@
      :description-text (i18n/label :t/finalise-migration-instructions)}]
    [rn/view {:style {:margin-horizontal 20}}
     [rn/view {:style {:padding-top 8 :padding-bottom 20}}
-     [quo/keycard {:holder-name ""}]]
+     [quo/keycard {:blur? true}]]
     [quo/section-label {:section (i18n/label :t/what-you-can-do) :container-style {:padding-vertical 8}}]
     [quo/settings-item
      {:title             (i18n/label :t/finalise-migration)
diff --git a/src/status_im/contexts/profile/config.cljs b/src/status_im/contexts/profile/config.cljs
@@ -10,6 +10,7 @@
   []
   {;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved
    :wakuV2Nameserver              "8.8.8.8"
+   :kdfIterations                 3200
    :statusProxyEnabled            config/status-proxy-enabled?
    :statusProxyStageName          config/status-proxy-stage-name
    :statusProxyMarketUser         config/STATUS_BUILD_PROXY_USER
diff --git a/test/appium/support/testrail_report.py b/test/appium/support/testrail_report.py
@@ -126,6 +126,7 @@ def get_regression_cases(self):
         test_cases['nightly']['activity_centre_other'] = 51005
         test_cases['nightly']['wallet'] = 59443
         test_cases['nightly']['fallback'] = 63472
+        test_cases['nightly']['android_versions'] = 63809
 
         ## Upgrade e2e
         # test_cases['upgrade']['general'] = 881
diff --git a/test/appium/tests/activity_center/test_activity_center.py b/test/appium/tests/activity_center/test_activity_center.py
@@ -1,4 +1,5 @@
 import pytest
+from appium.webdriver.connectiontype import ConnectionType
 from selenium.common.exceptions import TimeoutException
 
 from tests import marks, run_in_parallel
@@ -493,3 +494,23 @@ def test_activity_center_admin_notification_accept_swipe(self):
             self.errors.append(
                 self.home_2, "Community is not appeared in the list after accepting admin request from activity centre")
         self.errors.verify_no_errors()
+
+    @marks.testrail_id(741809)
+    def test_activity_centre_contact_request_receiver_offline(self):
+        self.device_2.navigate_back_to_home_view()
+
+        self.device_1.just_fyi("Device 1: Create a new user")
+        self.device_1.reopen_app(sign_in=False)
+        self.device_1.create_user(first_user=False)
+        new_username_1 = self.home_1.get_username()
+        self.device_1.chats_tab.click()
+
+        self.device_2.just_fyi("Device 2: Turn off network connection")
+        self.device_2.driver.set_network_connection(ConnectionType.AIRPLANE_MODE)
+
+        self.device_1.just_fyi("Device 1: Send a contact request")
+        self.home_1.add_contact(self.public_key_2)
+
+        self.device_2.just_fyi("Device 2: Turn on network connection and check that the contact request is received")
+        self.device_2.driver.set_network_connection(ConnectionType.ALL_NETWORK_ON)
+        self.home_2.handle_contact_request(username=new_username_1, notifications_count=3)
diff --git a/test/appium/tests/base_test_case.py b/test/appium/tests/base_test_case.py
@@ -49,14 +49,14 @@ def get_lambda_test_capabilities_real_device():
     return options
 
 
-def get_lambda_test_capabilities_emulator():
+def get_lambda_test_capabilities_emulator(platform_version: int = 14, device_name: str = "Pixel 6"):
     capabilities = {
         "lt:options": {
             "w3c": True,
             "platformName": "android",
-            "deviceName": "Pixel 6",
+            "deviceName": device_name,
             "appiumVersion": "2.1.3",
-            "platformVersion": "14",
+            "platformVersion": str(platform_version),
             "app": pytest_config_global['lt_apk_url'],
             "devicelog": True,
             "visual": True,
@@ -179,18 +179,19 @@ def verify_no_errors(self):
             pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 
 
-def create_shared_drivers(quantity):
+def create_shared_drivers(quantity: int, platform_version: int = 14, device_name: str = "Pixel 6"):
     drivers = dict()
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
     print('LT Executor: %s' % executor_lambda_test)
     try:
-        drivers = loop.run_until_complete(start_threads(test_suite_data.current_test.name,
-                                                        quantity,
-                                                        Driver,
-                                                        drivers,
-                                                        command_executor=executor_lambda_test,
-                                                        options=get_lambda_test_capabilities_emulator()))
+        drivers = loop.run_until_complete(
+            start_threads(test_suite_data.current_test.name,
+                          quantity,
+                          Driver,
+                          drivers,
+                          command_executor=executor_lambda_test,
+                          options=get_lambda_test_capabilities_emulator(platform_version, device_name)))
         if len(drivers) < quantity:
             test_suite_data.current_test.testruns[-1].error = "Not all %s drivers are created" % quantity
 
diff --git a/test/appium/tests/test_different_android_versions.py b/test/appium/tests/test_different_android_versions.py
@@ -0,0 +1,35 @@
+import pytest
+
+from base_test_case import MultipleSharedDeviceTestCase, create_shared_drivers
+from tests import marks
+from views.sign_in_view import SignInView
+
+
+def _check_account_creation(driver):
+    sign_in_view = SignInView(driver)
+    home_view = sign_in_view.create_user()
+    home_view.profile_button.wait_for_visibility_of_element()
+
+
+@pytest.mark.xdist_group(name="new_seven_3")
+@marks.nightly
+class TestAndroid12(MultipleSharedDeviceTestCase):
+
+    def prepare_devices(self):
+        self.drivers, self.loop = create_shared_drivers(quantity=1, platform_version=12, device_name="Pixel 5")
+
+    @marks.testrail_id(741806)
+    def test_create_account_android_12(self):
+        _check_account_creation(self.drivers[0])
+
+
+@pytest.mark.xdist_group(name="new_seven_3")
+@marks.nightly
+class TestAndroid13(MultipleSharedDeviceTestCase):
+
+    def prepare_devices(self):
+        self.drivers, self.loop = create_shared_drivers(quantity=1, platform_version=13)
+
+    @marks.testrail_id(741807)
+    def test_create_account_android_13(self):
+        _check_account_creation(self.drivers[0])
diff --git a/test/appium/views/home_view.py b/test/appium/views/home_view.py
@@ -271,7 +271,8 @@ def __init__(self, driver):
 
         # Notification centre
         self.notifications_button = Button(self.driver, accessibility_id="notifications-button")
-        self.notifications_unread_badge = BaseElement(self.driver, accessibility_id="activity-center-unread-count")
+        self.notifications_unread_badge = BaseElement(
+            self.driver, xpath="//*[@content-desc='activity-center-unread-count']/android.widget.TextView")
         self.open_activity_center_button = Button(self.driver, accessibility_id="open-activity-center-button")
         self.close_activity_centre = Button(self.driver, accessibility_id="close-activity-center")
 
@@ -375,11 +376,11 @@ def get_element_from_activity_center_view(self, message_body):
         chat_element = self.get_activity_center_element_by_text(message_body)
         return chat_element
 
-    def handle_contact_request(self, username: str, action='accept'):
+    def handle_contact_request(self, username: str, action: str = 'accept', notifications_count: int = 1):
         if self.toast_content_element.is_element_displayed(10):
             self.toast_content_element.wait_for_invisibility_of_element()
         try:
-            self.notifications_unread_badge.wait_for_visibility_of_element(120)
+            self.notifications_unread_badge.wait_for_element_text(text=str(notifications_count), wait_time=120)
         except TimeoutException:
             pass
         self.open_activity_center_button.click_until_presence_of_element(self.close_activity_centre)
@@ -396,7 +397,7 @@ def handle_contact_request(self, username: str, action='accept'):
                 chat_element.cancel_contact_request()
             else:
                 self.driver.fail("Illegal option for CR!")
-        except NoSuchElementException:
+        except (NoSuchElementException, TimeoutException):
             self.driver.fail("No contact request received from %s" % username)
         finally:
             self.close_activity_centre.wait_for_rendering_ended_and_click()
diff --git a/translations/en.json b/translations/en.json
@@ -876,7 +876,6 @@
   "empty-chat-description-one-to-one": "Any messages you send here are encrypted and can only be read by you and ",
   "empty-chat-description-public": "It's been quiet here for the last {{quiet-hours}}. Start the conversation or ",
   "empty-chat-description-public-share-this": "share this chat.",
-  "empty-keycard": "Empty Keycard",
   "empty-keycard-required": "Requires an empty Keycard",
   "empty-notifications-admin-tab": "No unread admin notifications",
   "empty-notifications-all-tab": "No unread notifications",
