Merge branch 'develop' into share-community-qr-17993

Author: Pau1fitz

Makefile

@@ -44,7 +44,7 @@ export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
 # Our custom config is located in nix/nix.conf
 export NIX_USER_CONF_FILES = $(PWD)/nix/nix.conf
 # Location of symlinks to derivations that should not be garbage collected
-export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-mobile
+export _NIX_GCROOTS = ./.nix-gcroots
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
 export _NIX_KEEP ?= TMPDIR,BUILD_ENV,\
 	BUILD_TYPE,BUILD_NUMBER,COMMIT_HASH,\
@@ -373,15 +373,20 @@ test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connection
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"
 
 test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js
-test-unit: export SHADOW_NS_REGEXP := ^(?!status-im\.integration-test).*-test$$
+test-unit: export SHADOW_NS_REGEXP := ^(?!tests\.integration-test)(?!tests-im\.contract-test).*-test$$
 test-unit: ##@test Run unit tests
 test-unit: _test-clojure
 
 test-integration: export SHADOW_OUTPUT_TO := target/integration_test/test.js
-test-integration: export SHADOW_NS_REGEXP := ^status-im\.integration-test.*$$
+test-integration: export SHADOW_NS_REGEXP := ^tests\.integration-test.*$$
 test-integration: ##@test Run integration tests
 test-integration: _test-clojure
 
+test-contract: export SHADOW_OUTPUT_TO := target/contract_test/test.js
+test-contract: export SHADOW_NS_REGEXP := ^tests\.contract-test.*$$
+test-contract: ##@test Run contract tests
+test-contract: _test-clojure
+
 android-test: jsbundle
 android-test: export TARGET := android
 android-test:

ci/Jenkinsfile.android

@@ -5,7 +5,7 @@ library '[email protected]'
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'linux && x86_64 && nix-2.14' }
+  agent { label 'linux && x86_64 && nix-2.19' }
 
   options {
     timestamps()

ci/Jenkinsfile.ios

@@ -5,7 +5,7 @@ library '[email protected]'
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'macos && arm64 && nix-2.14 && xcode-15.1' }
+  agent { label 'macos && arm64 && nix-2.19 && xcode-15.1' }
 
   parameters {
     string(

ci/Jenkinsfile.tests

@@ -5,7 +5,7 @@ library '[email protected]'
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'linux && x86_64 && nix-2.14' }
+  agent { label 'linux && x86_64 && nix-2.19' }
 
   options {
     timestamps()

nix/DETAILS.md

@@ -84,8 +84,10 @@ Would fail.
 
 # Garbage Collection
 
-The `make nix-gc` target calls `nix-store --gc` and normally would remove almost everything, but to prevent that we place symlinks to protected derivations in `/nix/var/nix/gcroots` subfolder. Specifically:
+The `make nix-gc` target calls `nix-store --gc` and normally would remove almost everything, but to prevent that we place symlinks to protected derivations in `.nix-gcroots` folder. Specifically:
 ```sh
-_NIX_GCROOTS="${_NIX_GCROOTS:-/nix/var/nix/gcroots/per-user/${USER}/status-mobile}"
+_NIX_GCROOTS="${_NIX_GCROOTS:-${GIT_ROOT}/.nix-gcroots}
 ```
+These symlinks in turn will be symlinked from  `/nix/var/nix/gcroots/auto` through use of `nix-store --add-gcroots`.
+
 Whenever `nix/scripts/build.sh` or `nix/scripts/shell.sh` are called they update symlinks named after given targets in that folder. This in combination with `keep-outputs = true` set in `nix/nix.conf` prevents garbage collection from removing too much.

nix/scripts/gcroots.sh

@@ -2,12 +2,12 @@
 
 set -Ee
 
-_NIX_GCROOTS="${_NIX_GCROOTS:-/nix/var/nix/gcroots/per-user/${USER}/status-mobile}"
-
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 source "${GIT_ROOT}/nix/scripts/source.sh"
 source "${GIT_ROOT}/scripts/colors.sh"
 
+_NIX_GCROOTS="${_NIX_GCROOTS:-${GIT_ROOT}/.nix-gcroots}"
+
 TARGET="${1}"
 shift
 if [[ -z "${TARGET}" ]]; then

nix/scripts/version.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
-# WARNING: Versions 2.14, 2.15, 2.16 have an issue creating gcroots:
-# https://github.com/NixOS/nix/issues/8564
-export NIX_VERSION="2.13.4"
-export NIX_PACKAGE="nixVersions.nix_2_13"
+export NIX_VERSION="2.19.3"
+export NIX_PACKAGE="nixVersions.nix_2_19"
 export NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
-export NIX_INSTALL_SHA256="a9908cc48f5886b4f22172bdd2f9657873276fd295e78c6ed97fb308c6d284d0"
+export NIX_INSTALL_SHA256="73d47b0ab783fddca1b2d44a03d52a74c97c28a1fc8ff5a29419079302ef9c3d"
 export NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"

resources/images/icons2/12x12/[email protected]

@@ -176,7 +176,6 @@
                                       ;; option setupFilesAfterEnv.
                                       test-helpers.component-tests-preload
                                       status-im.setup.schema-preload
-
                                       quo.core-spec
                                       status-im.core-spec]
                    :ns-regexp        "component-spec$"

resources/images/icons2/12x12/[email protected]

@@ -4,14 +4,19 @@
 
 (def backgrounds #{:photo :blur})
 
-(defn custom-color-type
+;; Note: We hardcode the :light theme for the background-color and apply an overlay when necessary, such
+;; as for dark themes and pressed states. This approach is taken because, for communities, we only have
+;; one color available, which is the light theme version.
+;; For more information, see the related issue: https://github.com/status-im/status-mobile/issues/16396
+(defn- custom-color-type
   [customization-color icon-only?]
-  {:icon-color       colors/white-opa-70
-   :label-color      colors/white
-   :background-color (colors/custom-color customization-color 50)
-   :border-radius    (when icon-only? 24)})
+  {:icon-color                  colors/white-opa-70
+   :label-color                 colors/white
+   :background-color            (colors/resolve-color customization-color :light)
+   :border-radius               (when icon-only? 24)
+   :overlay-customization-color customization-color})
 
-(defn grey-photo
+(defn- grey-photo
   [theme pressed?]
   {:icon-color         (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-70 theme)
    :label-color        (colors/theme-colors colors/neutral-100 colors/white theme)
@@ -24,23 +29,23 @@
                                               theme))
    :blur-type          (if (= theme :light) :light :dark)})
 
-(defn grey-blur
+(defn- grey-blur
   [theme pressed?]
   {:icon-color       (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-70 theme)
    :label-color      (colors/theme-colors colors/neutral-100 colors/white theme)
    :background-color (if pressed?
                        (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme)
                        (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5 theme))})
 
-(defn outline-blur
+(defn- outline-blur
   [theme pressed?]
   {:icon-color   (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
    :label-color  (colors/theme-colors colors/neutral-100 colors/white theme)
    :border-color (if pressed?
                    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 theme)
                    (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme))})
 
-(defn grey
+(defn- grey
   [theme pressed?]
   {:icon-color       (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
    :label-color      (colors/theme-colors colors/neutral-100 colors/white theme)
@@ -50,45 +55,48 @@
                                             colors/neutral-90
                                             theme))})
 
-(defn dark-grey
+(defn- dark-grey
   [theme pressed?]
   {:icon-color       (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
    :label-color      (colors/theme-colors colors/neutral-100 colors/white theme)
    :background-color (if pressed?
                        (colors/theme-colors colors/neutral-30 colors/neutral-60 theme)
                        (colors/theme-colors colors/neutral-20 colors/neutral-90 theme))})
 
-(defn outline
+(defn- outline
   [theme pressed?]
   {:icon-color   (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
    :label-color  (colors/theme-colors colors/neutral-100 colors/white theme)
    :border-color (if pressed?
                    (colors/theme-colors colors/neutral-40 colors/neutral-60 theme)
                    (colors/theme-colors colors/neutral-30 colors/neutral-70 theme))})
 
-(defn ghost
+(defn- ghost
   [theme pressed?]
   {:icon-color       (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
    :label-color      (colors/theme-colors colors/neutral-100 colors/white theme)
    :background-color (when pressed?
                        (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))})
 
-(defn black
+(defn- black
   [pressed?]
   {:label-color      colors/white
    :background-color (if pressed? colors/neutral-80 colors/neutral-95)})
 
 (defn get-values
   [{:keys [customization-color theme type background pressed? icon-only?]}]
-  (cond
-    (= type :primary)                            (custom-color-type customization-color icon-only?)
-    (= type :positive)                           (custom-color-type customization-color icon-only?)
-    (= type :danger)                             (custom-color-type customization-color icon-only?)
-    (and (= :photo background) (= type :grey))   (grey-photo theme pressed?)
-    (and (= :blur background) (= type :grey))    (grey-blur theme pressed?)
-    (and (= :blur background) (= type :outline)) (outline-blur theme pressed?)
-    (= type :grey)                               (grey theme pressed?)
-    (= type :dark-grey)                          (dark-grey theme pressed?)
-    (= type :outline)                            (outline theme pressed?)
-    (= type :ghost)                              (ghost theme pressed?)
-    (= type :black)                              (black pressed?)))
+  (let [customization-color (get {:primary  customization-color
+                                  :positive :success
+                                  :danger   :danger}
+                                 type)]
+    (cond
+      (contains? #{:primary :positive :danger} type) (custom-color-type customization-color
+                                                                        icon-only?)
+      (and (= :photo background) (= type :grey))     (grey-photo theme pressed?)
+      (and (= :blur background) (= type :grey))      (grey-blur theme pressed?)
+      (and (= :blur background) (= type :outline))   (outline-blur theme pressed?)
+      (= type :grey)                                 (grey theme pressed?)
+      (= type :dark-grey)                            (dark-grey theme pressed?)
+      (= type :outline)                              (outline theme pressed?)
+      (= type :ghost)                                (ghost theme pressed?)
+      (= type :black)                                (black pressed?))))

resources/images/icons2/20x20/[email protected]

@@ -37,13 +37,10 @@
                pressed? on-press-in on-press-out allow-multiple-presses?]
         :or   {type                :primary
                size                40
-               customization-color (cond (= type :primary)  :blue
-                                         (= type :positive) :success
-                                         (= type :danger)   :danger
-                                         :else              nil)}}
+               customization-color (if (= type :primary) :blue nil)}}
        children]
       (let [{:keys [icon-color background-color label-color border-color blur-type
-                    blur-overlay-color border-radius]}
+                    blur-overlay-color border-radius overlay-customization-color]}
             (button-properties/get-values {:customization-color customization-color
                                            :background          background
                                            :type                type
@@ -79,9 +76,9 @@
                                             :icon-left        icon-left
                                             :icon-right       icon-right})
                     inner-style)}
-           (when customization-color
+           (when overlay-customization-color
              [customization-colors/overlay
-              {:customization-color customization-color
+              {:customization-color overlay-customization-color
                :theme               theme
                :pressed?            (if pressed? pressed? @pressed-state?)}])
            (when (= background :photo)

resources/images/icons2/20x20/[email protected]

@@ -35,7 +35,7 @@
             (when (and @ref (>= index 0))
               (some-> ^js @ref
                       (.scrollToIndex #js
-                                       {:animated     true
+                                       {:animated     false
                                         :index        index
                                         :viewPosition 0.5})))))
         50)))

resources/images/icons2/20x20/[email protected]

@@ -3,34 +3,60 @@
     [quo.components.drawers.bottom-actions.view :as bottom-actions]
     [test-helpers.component :as h]))
 
+(defn- render
+  [component]
+  (h/render-with-theme-provider component :light))
+
 (h/describe "bottom actions tests"
   (h/test "default render with no description and single action button"
-    (h/render [bottom-actions/view {:button-one-label "Request to join"}])
+    (render [bottom-actions/view {:actions :one-action :button-one-label "Request to join"}])
     (h/is-truthy (h/get-by-text "Request to join")))
 
-  (h/test "render with description"
-    (h/render [bottom-actions/view {:description "Sample description"}])
-    (h/is-truthy (h/get-by-text "Sample description")))
+  (h/test "render with description & 1 action"
+    (render [bottom-actions/view
+             {:description      :bottom
+              :description-text "Sample description"
+              :actions          :one-action
+              :button-one-label "Request to join"}])
+    (h/is-truthy (h/get-by-text "Sample description"))
+    (h/is-truthy (h/get-by-text "Request to join")))
 
   (h/test "render with 2 actions"
     (let [button-one "Button One"
           button-two "Button Two"]
-      (h/render [bottom-actions/view
-                 {:actions          :2-actions
-                  :button-one-label button-one
-                  :button-one-props {:icon-left :i/arrow-left}
-                  :button-two-label button-two}])
+      (render [bottom-actions/view
+               {:actions          :two-actions
+                :button-one-label button-one
+                :button-one-props {:icon-left :i/arrow-left}
+                :button-two-label button-two}])
       (h/is-truthy (h/get-by-text button-one))
       (h/is-truthy (h/get-by-label-text :icon))
       (h/is-truthy (h/get-by-text button-two))))
 
   (h/test "render disabled button"
-    (h/render [bottom-actions/view
-               {:description      "Sample description"
-                :button-one-props {:disabled? true}
-                :button-one-label "button"}])
+    (render [bottom-actions/view
+             {:description      :bottom
+              :actions          :one-action
+              :description-text "Sample description"
+              :button-one-props {:disabled? true}
+              :button-one-label "button"}])
     (h/is-disabled (h/get-by-label-text :button-one)))
 
-  (h/test "sane defaults"
-    (h/render [bottom-actions/view {}])
-    (h/is-truthy (h/get-by-label-text :button-one))))
+  (h/test "render with error & 1 action"
+    (render [bottom-actions/view
+             {:description      :top-error
+              :error-message    "Sample error"
+              :actions          :one-action
+              :button-one-label "Request to join"}])
+    (h/is-truthy (h/get-by-text "Sample error"))
+    (h/is-truthy (h/get-by-text "Request to join")))
+
+  (h/test "render with top description & 1 action"
+    (render [bottom-actions/view
+             {:description      :top
+              :role             :admin
+              :actions          :one-action
+              :button-one-label "Request to join"}])
+    (h/is-truthy (h/get-by-text "Eligible to join as"))
+    (h/is-truthy (h/get-by-text "Admin"))
+    (h/is-truthy (h/get-by-text "Request to join"))))