ios: fix xcode using system Node.js version

As discovered in:
https://github.com/status-im/status-mobile/pull/15225

The attempt to fix this in:
https://github.com/status-im/status-mobile/pull/15180

But it doesn't appear to work, so instead I'm allowing an override of
`NODE_BINARY` variable and spetting it when defining the Nix shell.

The key things here are:

* Xcode injects its own paths into `PATH` which breaks Nix env.
* Combining Nix shells with `inputsFrom` does not inherit all vars.

It's important to set these variables in `shellHook` and not elsewhere.

Signed-off-by: Jakub Sokołowski <jakub@status.im>

ci/Jenkinsfile.android

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.5'
+library 'status-jenkins-lib@v1.6.6'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.combined

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.6'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.5'
+library 'status-jenkins-lib@v1.6.6'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.nix-cache

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.6'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/Jenkinsfile.tests

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.6'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-prs

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.5'
+library 'status-jenkins-lib@v1.6.6'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.6'
 
 pipeline {
   agent { label 'macos' }

ci/tools/Jenkinsfile.playstore-meta

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.6'
 
 pipeline {
   agent { label 'linux' }

ios/StatusIm.xcodeproj/project.pbxproj

@@ -525,8 +525,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "set -o errexit\nexport NODE_BINARY=\"node\"\nexport NODE_ARGS=\" --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./react-native-xcode.log 2>&1";
+			shellPath = "/usr/bin/env sh";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\" --openssl-legacy-provider --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./react-native-xcode.log 2>&1";
 		};
 		0F876BD5356F61BF142A01A0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -546,7 +546,7 @@
 				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -568,7 +568,7 @@
 				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -583,8 +583,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "set -o errexit\nexport NODE_BINARY=\"node\"\nexport NODE_ARGS=\" --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./react-native-xcode.log 2>&1";
+			shellPath = "/usr/bin/env sh";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\" --openssl-legacy-provider --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./react-native-xcode.log 2>&1";
 		};
 		3AAD2AD724A3A60E0075D594 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -597,7 +597,7 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
 		};
 		3C1038075AE5E6FB86AC2319 /* [CP] Copy Pods Resources */ = {
@@ -618,7 +618,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -640,7 +640,7 @@
 				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -662,7 +662,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -677,7 +677,7 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
 		};
 		E732E3E1B024946173BF6D3D /* [CP] Copy Pods Resources */ = {
@@ -698,7 +698,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};

ios/StatusIm/Info.plist

@@ -52,7 +52,7 @@
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
-	<string>1aa92c4d-6194-4d7d-b70a-16b48256b87e</string>
+	<string>37d5ac79-0eb2-4e66-9117-8a8515185a7f</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>whatsapp</string>

ios/StatusImPR/Info.plist

@@ -48,7 +48,7 @@
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
-	<string>1aa92c4d-6194-4d7d-b70a-16b48256b87e</string>
+	<string>37d5ac79-0eb2-4e66-9117-8a8515185a7f</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>whatsapp</string>

nix/mobile/ios/default.nix

@@ -20,6 +20,7 @@ in {
     ];
 
     # WARNING: Executes shellHook in reverse order.
+    # WARNING: Only some variables are merged.
     inputsFrom = [
       fastlane.shell
       cocoapods-sh

nix/mobile/ios/shells/nodejs.nix

@@ -1,8 +1,14 @@
-{ mkShell, deps }:
+{ mkShell, nodejs, deps }:
 
 mkShell {
-  # check if node modules changed and if so install them
+  # Check if node modules changed and if so install them.
   shellHook = ''
+    # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
+    export NODE_OPTIONS="--openssl-legacy-provider";
+
+    # Fix Xcode using system Node.js version.
+    export NODE_BINARY="${nodejs}/bin/node";
+
     export STATUS_MOBILE_HOME=$(git rev-parse --show-toplevel)
     "$STATUS_MOBILE_HOME/nix/scripts/node_modules.sh" ${deps.nodejs-patched}
   '';

shadow-cljs.edn

@@ -82,7 +82,7 @@
    :optimizations    :simple
    :target           :node-test
    ;; When running tests without a REPL you can uncomment below line to `make test-watch` a specific file
-   ;;:ns-regexp        "status-im2.subs.subs-test$"
+   ;; :ns-regexp        "status-im2.subs.chat.messages-test$"
    :main
    status-im.test-runner/main
    ;; set :ui-driven to true to let shadow-cljs inject node-repl

src/quo2/components/selectors/disclaimer/style.cljs

@@ -3,8 +3,7 @@
 
 (defn container
   []
-  {:flex             1
-   :flex-direction   :row
+  {:flex-direction   :row
    :background-color (colors/theme-colors colors/neutral-5 colors/neutral-80-opa-40)
    :padding          11
    :align-self       :stretch

src/status_im/chat/models/mentions.cljs

@@ -193,17 +193,21 @@
    [alias name nickname]))
 
 (defn add-searchable-phrases-to-contact
-  [{:keys [alias name added? blocked? identicon public-key nickname ens-verified]} community-chat?]
+  [{:keys [alias name added? blocked? identicon public-key nickname ens-verified display-name]}
+   community-chat?]
   (when (and alias
              (not (string/blank? alias))
              (or name
+                 display-name
                  nickname
                  added?
                  community-chat?)
              (not blocked?))
     (add-searchable-phrases
      {:alias        alias
-      :name         (or (and ens-verified (utils/safe-replace name ".stateofus.eth" "")) alias)
+      :name         (or (and ens-verified (utils/safe-replace name ".stateofus.eth" ""))
+                        (when-not (string/blank? display-name) display-name)
+                        alias)
       :identicon    identicon
       :nickname     nickname
       :ens-verified ens-verified

src/status_im/contact/db.cljs

@@ -43,8 +43,8 @@
 (defn sort-contacts
   [contacts]
   (sort (fn [c1 c2]
-          (let [name1 (or (:name c1) (:address c1) (:public-key c1))
-                name2 (or (:name c2) (:address c2) (:public-key c2))]
+          (let [name1 (first (:two-names c1))
+                name2 (first (:two-names c2))]
             (compare (string/lower-case name1)
                      (string/lower-case name2))))
         (vals contacts)))

src/status_im/multiaccounts/core.cljs

@@ -40,11 +40,8 @@
              :three-words-name (or alias (gfycat/generate-gfy public-key))}
       ;; Preferred name is our own otherwise we make sure it's verified
       (or preferred-name (and ens-verified name))
-      (assoc :ens-name (str "@" (or (stateofus/username ens-name) ens-name))))))
+      (assoc :ens-name (or (stateofus/username ens-name) ens-name)))))
 
-;; NOTE: this does a bit of unnecessary work, we could short-circuit the work
-;; once the first two are found, i.e don't calculate short key if 2 are already
-;; available
 (defn contact-two-names
   "Returns vector of two names in next order nickname, ens name, display-name, three word name, public key"
   [{:keys [names
@@ -56,28 +53,30 @@
                 display-name
                 three-words-name]}
         (or names (contact-names contact))
-        short-public-key (when public-key?
-                           (utils/get-shortened-address (or compressed-key
-                                                            public-key)))]
-    (->> [nickname ens-name display-name three-words-name short-public-key]
-         (remove string/blank?)
-         (take 2))))
+        non-empty-names (remove string/blank? [nickname ens-name display-name three-words-name])]
+    (if (> (count non-empty-names) 1)
+      (vec (take 2 non-empty-names))
+      [(first non-empty-names)
+       (when public-key? (utils/get-shortened-address (or compressed-key public-key)))])))
 
 (defn contact-with-names
   "Returns contact with :names map "
   [contact]
-  (assoc contact :names (contact-names contact)))
+  (let [contact' (assoc contact :names (contact-names contact))]
+    (assoc contact' :two-names (contact-two-names contact' true))))
 
 (defn displayed-name
-  "Use preferred name, name or alias in that order"
-  [{:keys [name preferred-name alias public-key ens-verified]}]
-  (let [ens-name (or preferred-name
-                     name)]
+  "Use preferred name, display-name, name or alias in that order"
+  [{:keys [name display-name preferred-name alias public-key ens-verified]}]
+  (let [display-name (if (string/blank? display-name) nil display-name)
+        ens-name     (or preferred-name
+                         display-name
+                         name)]
     ;; Preferred name is our own otherwise we make sure it's verified
     (if (or preferred-name (and ens-verified name))
       (let [username (stateofus/username ens-name)]
-        (str "@" (or username ens-name)))
-      (or alias (gfycat/generate-gfy public-key)))))
+        (or username ens-name))
+      (or display-name alias (gfycat/generate-gfy public-key)))))
 
 (defn contact-by-identity
   [contacts identity]

src/status_im/multiaccounts/core_test.cljs

@@ -29,11 +29,11 @@
   (testing "names is nil"
     (testing "nickname has precedence"
       (is
-       (= [nickname formatted-ens]
+       (= [nickname ens-name]
           (ma/contact-two-names contact public-key))))
     (testing "ens name is second option"
       (is
-       (= [formatted-ens display-name]
+       (= [ens-name display-name]
           (ma/contact-two-names
            (dissoc contact :nickname)
            public-key))))

src/status_im/router/core.cljs

@@ -8,6 +8,8 @@
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.eip681 :as eip681]
             [status-im.ethereum.ens :as ens]
+            [status-im.utils.types :as types]
+            [status-im.native-module.core :as status]
             [status-im.ethereum.stateofus :as stateofus]
             [status-im2.utils.validators :as validators]
             [status-im.utils.http :as http]
@@ -71,15 +73,27 @@
 
 (defn match-contact-async
   [chain {:keys [user-id ens-name]} callback]
-  (let [valid-key (and (validators/valid-public-key? user-id)
-                       (not= user-id ens/default-key))]
+  (let [valid-public-key?     (and (validators/valid-public-key? user-id)
+                                   (not= user-id ens/default-key))
+        valid-compressed-key? (validators/valid-compressed-key? user-id)]
     (cond
-      valid-key
+      valid-public-key?
       (callback {:type       :contact
                  :public-key user-id
                  :ens-name   ens-name})
 
-      (and (not valid-key)
+      valid-compressed-key?
+      (status/compressed-key->public-key
+       user-id
+       (fn [response]
+         (let [{:keys [error]} (types/json->clj response)]
+           (when-not error
+             (match-contact-async
+              chain
+              {:user-id (str "0x" (subs response 5)) :ens-name ens-name}
+              callback)))))
+
+      (and (not valid-public-key?)
            (string? user-id)
            (not (string/blank? user-id))
            (not= user-id "0x"))

src/status_im/ui2/screens/chat/components/new_chat/styles.cljs

@@ -16,6 +16,7 @@
    :justify-content :center
    :align-items     :center})
 
-(defn chat-button
-  [{:keys [bottom]}]
-  {:bottom (- bottom 50)})
+(def chat-button
+  {:position   :absolute
+   :bottom     30
+   :align-self :center})

src/status_im/ui2/screens/chat/components/new_chat/view.cljs

@@ -6,14 +6,13 @@
             [reagent.core :as reagent]
             [status-im2.constants :as constants]
             [utils.i18n :as i18n]
-            [status-im.ui.components.react :as react]
+            [react-native.core :as rn]
             [utils.re-frame :as rf]
-            [status-im.ui.components.toolbar :as toolbar]
+            [clojure.string :as string]
             [status-im2.common.contact-list.view :as contact-list]
             [quo2.components.markdown.text :as text]
             [status-im.ui.components.invite.events :as invite.events]
             [status-im.ui2.screens.chat.components.new-chat.styles :as style]
-            [quo.components.safe-area :as safe-area]
             [status-im.react-native.resources :as resources]))
 
 (defn- hide-sheet-and-dispatch
@@ -33,11 +32,11 @@
 
 (defn- no-contacts-view
   []
-  [react/view
+  [rn/view
    {:style {:justify-content :center
             :align-items     :center
             :margin-top      120}}
-   [react/image
+   [rn/image
     {:source (resources/get-image (if (quo2.colors/dark?) :no-contacts-dark :no-contacts))}]
    [text/text
     {:weight :semi-bold
@@ -64,19 +63,26 @@
   []
   [:f>
    (fn []
-     (let [contacts                                     (rf/sub
-                                                         [:contacts/sorted-and-grouped-by-first-letter])
-           selected-contacts-count                      (rf/sub [:selected-contacts-count])
-           window-height                                (rf/sub [:dimensions/window-height])
-           one-contact-selected?                        (= selected-contacts-count 1)
-           contacts-selected?                           (pos? selected-contacts-count)
-           {:keys [names public-key]}                   (-> contacts first :data first)
-           added?                                       (reagent/atom '())
-           {:keys [nickname ens-name three-words-name]} names
-           first-username                               (or ens-name nickname three-words-name)
-           no-contacts?                                 (empty? contacts)
-           safe-area                                    (safe-area/use-safe-area)]
-       [react/view {:style {:height (* window-height 0.9)}}
+     (let [contacts (rf/sub
+                     [:contacts/sorted-and-grouped-by-first-letter])
+           selected-contacts-count (rf/sub [:selected-contacts-count])
+           selected-contacts (rf/sub [:group/selected-contacts])
+           window-height (rf/sub [:dimensions/window-height])
+           one-contact-selected? (= selected-contacts-count 1)
+           contacts-selected? (pos? selected-contacts-count)
+           {:keys [names public-key]} (when one-contact-selected?
+                                        (rf/sub [:contacts/contact-by-identity
+                                                 (first selected-contacts)]))
+           added? (reagent/atom '())
+           {:keys [nickname ens-name display-name
+                   three-words-name]}
+           names
+           first-username (or nickname
+                              ens-name
+                              (when-not (string/blank? display-name) display-name)
+                              three-words-name)
+           no-contacts? (empty? contacts)]
+       [rn/view {:style {:height (* window-height 0.9)}}
         [quo2/button
          {:type                      :grey
           :icon                      true
@@ -85,7 +91,7 @@
           :override-background-color (quo2.colors/theme-colors quo2.colors/neutral-10
                                                                quo2.colors/neutral-90)}
          :i/close]
-        [react/view style/contact-selection-heading
+        [rn/view style/contact-selection-heading
          [quo2/text
           {:weight :semi-bold
            :size   :heading-1
@@ -99,9 +105,8 @@
             (i18n/label :t/selected-count-from-max
                         {:selected (inc selected-contacts-count)
                          :max      constants/max-group-chat-participants})])]
-        [react/view
-         {:style {:height        430
-                  :margin-bottom -20}}
+        [rn/view
+         {:style {:flex 1}}
          (if no-contacts?
            [no-contacts-view]
            [contact-list/contact-list
@@ -110,21 +115,19 @@
              :added?            added?
              :search?           false
              :start-a-new-chat? true
-             :on-toggle         on-toggle}])]
+             :on-toggle         on-toggle}
+            70])]
         (when contacts-selected?
-          [toolbar/toolbar
-           {:size         :default
-            :show-border? false
-            :center       [button/button
-                           {:type                :primary
-                            :accessibility-label :next-button
-                            :style               (style/chat-button safe-area)
-                            :on-press            (fn []
-                                                   (if one-contact-selected?
-                                                     (hide-sheet-and-dispatch [:chat.ui/start-chat
-                                                                               public-key])
-                                                     (hide-sheet-and-dispatch [:navigate-to
-                                                                               :new-group])))}
-                           (if one-contact-selected?
-                             (i18n/label :t/chat-with {:selected-user first-username})
-                             (i18n/label :t/setup-group-chat))]}])]))])
+          [button/button
+           {:type                :primary
+            :style               style/chat-button
+            :accessibility-label :next-button
+            :on-press            (fn []
+                                   (if one-contact-selected?
+                                     (hide-sheet-and-dispatch [:chat.ui/start-chat
+                                                               public-key])
+                                     (hide-sheet-and-dispatch [:navigate-to
+                                                               :new-group])))}
+           (if one-contact-selected?
+             (i18n/label :t/chat-with {:selected-user first-username})
+             (i18n/label :t/setup-group-chat))])]))])

src/status_im/utils/universal_links/core.cljs

@@ -113,11 +113,7 @@
      :pop-to-root-tab-fx :profile-stack}
 
     public-key
-    (navigation/navigate-to-cofx (-> cofx
-                                     (assoc-in [:db :contacts/identity] public-key)
-                                     (assoc-in [:db :contacts/ens-name] ens-name))
-                                 :profile
-                                 {})))
+    {:dispatch [:chat.ui/show-profile public-key ens-name]}))
 
 (rf/defn handle-eip681
   [cofx data]

src/status_im2/common/bottom_sheet/styles.cljs

@@ -31,13 +31,13 @@
    :overflow :hidden})
 
 (defn content-style
-  [insets]
+  [insets bottom-safe-area-spacing?]
   {:position       :absolute
    :left           0
    :right          0
    :top            0
    :padding-top    border-radius
-   :padding-bottom (:bottom insets)})
+   :padding-bottom (if bottom-safe-area-spacing? (:bottom insets) 0)})
 
 (defn selected-background
   []

src/status_im2/common/bottom_sheet/view.cljs

@@ -81,23 +81,25 @@
 
 (defn bottom-sheet
   [props children]
-  (let [{on-cancel             :on-cancel
-         disable-drag?         :disable-drag?
-         show-handle?          :show-handle?
-         visible?              :visible?
-         backdrop-dismiss?     :backdrop-dismiss?
-         expandable?           :expandable?
-         selected-item         :selected-item
-         is-initially-expaned? :expanded?
-         :or                   {show-handle?          true
-                                backdrop-dismiss?     true
-                                expandable?           false
-                                is-initially-expaned? false}}
+  (let [{on-cancel                 :on-cancel
+         disable-drag?             :disable-drag?
+         show-handle?              :show-handle?
+         visible?                  :visible?
+         backdrop-dismiss?         :backdrop-dismiss?
+         expandable?               :expandable?
+         bottom-safe-area-spacing? :bottom-safe-area-spacing?
+         selected-item             :selected-item
+         is-initially-expanded?    :expanded?
+         :or                       {show-handle?              true
+                                    backdrop-dismiss?         true
+                                    expandable?               false
+                                    bottom-safe-area-spacing? true
+                                    is-initially-expanded?    false}}
         props
         content-height (reagent/atom nil)
         show-bottom-sheet? (reagent/atom nil)
         keyboard-was-shown? (reagent/atom false)
-        expanded? (reagent/atom is-initially-expaned?)
+        expanded? (reagent/atom is-initially-expanded?)
         gesture-running? (reagent/atom false)
         reset-atoms (fn []
                       (reset! show-bottom-sheet? nil)
@@ -226,7 +228,7 @@
                           {:behaviour (if platform/ios? :padding :height)
                            :style     {:flex 1}}
                           [rn/view
-                           {:style     (styles/content-style insets)
+                           {:style     (styles/content-style insets bottom-safe-area-spacing?)
                             :on-layout (when-not (and
                                                   (some? @content-height)
                                                   (> @content-height 0))

src/status_im2/common/contact_list/view.cljs

@@ -9,7 +9,7 @@
   [quo/divider-label {:label title}])
 
 (defn contact-list
-  [data]
+  [data padding-bottom]
   (let [contacts (if (:group data)
                    (rf/sub [:contacts/grouped-by-first-letter])
                    (rf/sub [:contacts/filtered-active-sections]))]
@@ -18,6 +18,6 @@
       :sticky-section-headers-enabled false
       :sections                       contacts
       :render-section-header-fn       contacts-section-header
-      :content-container-style        {:padding-bottom 20}
+      :content-container-style        {:padding-bottom (or padding-bottom 20)}
       :render-data                    data
       :render-fn                      contact-list-item/contact-list-item}]))

src/status_im2/constants.cljs

@@ -214,8 +214,8 @@
   {2        {0 image-size
              1 image-size}
    3        {0 [(* image-size 2) (* image-size 1.5)]
-             1 [(- image-size 1) (- (* image-size 0.67) 1)]
-             2 [(- image-size 1) (- (* image-size 0.67) 1)]}
+             1 [(- image-size 0.5) (- (* image-size 0.67) 1)]
+             2 [(- image-size 0.5) (- (* image-size 0.67) 1)]}
    4        {0 image-size
              1 image-size
              2 image-size

src/status_im2/contexts/activity_center/notification/contact_request/view.cljs

@@ -41,7 +41,7 @@
                       {:type :negative :label (i18n/label :t/declined)}
                       nil)}
         (case (:contact-request-state message)
-          constants/contact-request-state-mutual
+          constants/contact-request-message-state-pending
           {:button-1 {:label               (i18n/label :t/decline)
                       :accessibility-label :decline-contact-request
                       :type                :danger

src/status_im2/contexts/activity_center/utils.cljs

@@ -2,5 +2,10 @@
 
 (defn contact-name
   [contact]
-  (or (get-in contact [:names :nickname])
-      (get-in contact [:names :three-words-name])))
+  (->> [(get-in contact [:names :nickname])
+        (get-in contact [:names :ens-name])
+        (get-in contact [:names :display-name])
+        (get-in contact [:names :three-words-name])]
+
+       (filter seq)
+       first))

src/status_im2/contexts/chat/messages/content/album/style.cljs

@@ -14,12 +14,12 @@
    :overflow       :hidden})
 
 (defn image
-  [dimensions index portrait?]
+  [dimensions index portrait? images-count]
   {:width         (:width dimensions)
    :height        (:height dimensions)
-   :margin-left   (when (or (and (not= index 0) (not= index 2) (not= count 3))
-                            (= count 3)
-                            (and portrait? (= index 2)))
+   :margin-left   (when (or (and (not= index 0) (not= index 2) (not= images-count 3))
+                            (and (not portrait?) (= images-count 3) (= index 2))
+                            (and portrait? (= images-count 3) (> index 0)))
                     1)
    :margin-bottom (when (< index 2) 1)
    :align-self    :flex-start})

src/status_im2/contexts/chat/messages/content/album/view.cljs

@@ -5,8 +5,7 @@
             [react-native.fast-image :as fast-image]
             [status-im2.contexts.chat.messages.content.album.style :as style]
             [status-im2.constants :as constants]
-            [utils.re-frame :as rf]
-            [status-im2.contexts.chat.messages.content.image.view :as image]))
+            [utils.re-frame :as rf]))
 
 (def rectangular-style-count 3)
 
@@ -17,7 +16,7 @@
     {:width (second size-arr) :height (first size-arr) :album-style album-style}))
 
 (defn album-message
-  [{:keys [albumize?] :as message}]
+  [message]
   (let [shared-element-id (rf/sub [:shared-element-id])
         first-image       (first (:album message))
         album-style       (if (> (:image-width first-image) (:image-height first-image))
@@ -26,43 +25,44 @@
         images-count      (count (:album message))
         ;; album images are always square, except when we have 3 images, then they must be rectangular
         ;; (portrait or landscape)
-        portrait?         (and (= images-count rectangular-style-count) (= album-style :portrait))]
-    (if (and albumize? (> images-count 1))
-      [rn/view
-       {:style (style/album-container portrait?)}
-       (map-indexed
-        (fn [index item]
-          (let [images-size-key (if (< images-count constants/max-album-photos) images-count :default)
-                size            (get-in constants/album-image-sizes [images-size-key index])
-                dimensions      (if (not= images-count rectangular-style-count)
-                                  {:width size :height size}
-                                  (find-size size album-style))]
-            [rn/touchable-opacity
-             {:key            (:message-id item)
-              :active-opacity 1
-              :on-press       (fn []
-                                (rf/dispatch [:chat.ui/update-shared-element-id (:message-id item)])
-                                (js/setTimeout #(rf/dispatch [:navigate-to :lightbox
-                                                              {:messages (:album message) :index index}])
-                                               100))}
-             [fast-image/fast-image
-              {:style     (style/image dimensions index portrait?)
-               :source    {:uri (:image (:content item))}
-               :native-ID (when (and (= shared-element-id (:message-id item))
-                                     (< index constants/max-album-photos))
-                            :shared-element)}]
-             (when (and (> images-count constants/max-album-photos)
-                        (= index (- constants/max-album-photos 1)))
-               [rn/view
-                {:style style/overlay}
-                [quo/text
-                 {:weight :bold
-                  :size   :heading-2
-                  :style  {:color colors/white}}
-                 (str "+" (- images-count (dec constants/max-album-photos)))]])]))
-        (:album message))]
-      [:<>
-       (map-indexed
-        (fn [index item]
-          [image/image-message index item])
-        (:album message))])))
+        portrait?         (and (= images-count rectangular-style-count) (= album-style :portrait))
+        text              (:text (:content first-image))]
+    [:<>
+     ;; This text comp is temporary. Should later use
+     ;; `status-im2.contexts.chat.messages.content.text.view`
+     (when (not= text "placeholder") [quo/text {:style {:margin-bottom 10}} text])
+     [rn/view
+      {:style (style/album-container portrait?)}
+      (map-indexed
+       (fn [index item]
+         (let [images-size-key (if (< images-count constants/max-album-photos) images-count :default)
+               size            (get-in constants/album-image-sizes [images-size-key index])
+               dimensions      (if (not= images-count rectangular-style-count)
+                                 {:width size :height size}
+                                 (find-size size album-style))]
+           [rn/touchable-opacity
+            {:key            (:message-id item)
+             :active-opacity 1
+             ;; issue: https://github.com/status-im/status-mobile/issues/14995
+             :on-long-press  #(js/alert "Action drawer for albums is not supported yet")
+             :on-press       (fn []
+                               (rf/dispatch [:chat.ui/update-shared-element-id (:message-id item)])
+                               (js/setTimeout #(rf/dispatch [:navigate-to :lightbox
+                                                             {:messages (:album message) :index index}])
+                                              100))}
+            [fast-image/fast-image
+             {:style     (style/image dimensions index portrait? images-count)
+              :source    {:uri (:image (:content item))}
+              :native-ID (when (and (= shared-element-id (:message-id item))
+                                    (< index constants/max-album-photos))
+                           :shared-element)}]
+            (when (and (> images-count constants/max-album-photos)
+                       (= index (- constants/max-album-photos 1)))
+              [rn/view
+               {:style style/overlay}
+               [quo/text
+                {:weight :bold
+                 :size   :heading-2
+                 :style  {:color colors/white}}
+                (str "+" (- images-count (dec constants/max-album-photos)))]])]))
+       (:album message))]]))

src/status_im2/contexts/chat/messages/content/image/view.cljs

@@ -1,12 +1,15 @@
 (ns status-im2.contexts.chat.messages.content.image.view
-  (:require [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]
-            [utils.re-frame :as rf]))
+  (:require
+   [quo2.core :as quo]
+   [react-native.core :as rn]
+   [react-native.fast-image :as fast-image]
+   [status-im2.constants :as constants]
+   [utils.re-frame :as rf]))
 
 (defn calculate-dimensions
   [width height]
-  (let [max-width  (if (> width height) 320 190)
-        max-height (if (> width height) 190 320)]
+  (let [max-width  (if (> width height) (* 2 constants/image-size) (* 1.5 constants/image-size))
+        max-height (if (> width height) (* 1.5 constants/image-size) (* 2 constants/image-size))]
     (if (> height width)
       (let [calculated-height (* (min height max-height) (/ (max width max-width) width))
             calculated-width  (* (max width max-width) (/ (min height max-height) height))]
@@ -16,7 +19,7 @@
         {:width calculated-width :height calculated-height}))))
 
 (defn image-message
-  [index {:keys [content image-width image-height message-id] :as message}]
+  [_ {:keys [content image-width image-height message-id] :as message} context on-long-press]
   (let [dimensions (calculate-dimensions (or image-width 1000) (or image-height 1000))
         text       (:text content)]
     (fn []
@@ -24,7 +27,7 @@
         [rn/touchable-opacity
          {:active-opacity 1
           :key            message-id
-          :style          {:margin-top (when (> index 0) 20)}
+          :on-long-press  #(on-long-press message context)
           :on-press       (fn []
                             (rf/dispatch [:chat.ui/update-shared-element-id message-id])
                             (js/setTimeout #(rf/dispatch [:navigate-to :lightbox
@@ -32,7 +35,7 @@
                                            100))}
          ;; This text comp is temporary. Should later use
          ;; `status-im2.contexts.chat.messages.content.text.view`
-         (when (and (not= text "placeholder") (= index 0)) [rn/text text])
+         (when (not= text "placeholder") [quo/text {:style {:margin-bottom 10}} text])
          [fast-image/fast-image
           {:source    {:uri (:image content)}
            :style     (merge dimensions {:border-radius 12})

src/status_im2/contexts/chat/messages/content/reactions/view.cljs

@@ -6,8 +6,10 @@
             [status-im2.contexts.chat.messages.drawers.view :as drawers]))
 
 (defn message-reactions-row
-  [chat-id message-id]
-  (let [reactions (rf/sub [:chats/message-reactions message-id chat-id])]
+  [chat-id message-id messages-ids]
+  (let [reactions (if messages-ids
+                    (mapcat #(rf/sub [:chats/message-reactions % chat-id]) messages-ids)
+                    (rf/sub [:chats/message-reactions message-id chat-id]))]
     (when (seq reactions)
       [rn/view {:margin-left 52 :margin-bottom 12 :flex-direction :row}
        (for [{:keys [own emoji-id quantity emoji-reaction-id] :as emoji-reaction} reactions]
@@ -28,8 +30,12 @@
             :accessibility-label (str "emoji-reaction-" emoji-id)}]])
        [quo/add-reaction
         {:on-press (fn []
-                     (rf/dispatch [:dismiss-keyboard])
-                     (rf/dispatch
-                      [:bottom-sheet/show-sheet
-                       {:content (fn [] [drawers/reactions
-                                         {:chat-id chat-id :message-id message-id}])}]))}]])))
+                     ;; issue: https://github.com/status-im/status-mobile/issues/14995
+                     (if messages-ids
+                       (js/alert "Reactions for albums is not yet supported")
+                       (do
+                         (rf/dispatch [:dismiss-keyboard])
+                         (rf/dispatch
+                          [:bottom-sheet/show-sheet
+                           {:content (fn [] [drawers/reactions
+                                             {:chat-id chat-id :message-id message-id}])}]))))}]])))

src/status_im2/contexts/chat/messages/content/view.cljs

@@ -83,6 +83,13 @@
   (rf/dispatch [:bottom-sheet/show-sheet
                 {:content (drawers/reactions-and-actions message-data context)}]))
 
+(defn on-long-press
+  [message-data context]
+  (rf/dispatch [:dismiss-keyboard])
+  (rf/dispatch [:bottom-sheet/show-sheet
+                {:content (drawers/reactions-and-actions message-data
+                                                         context)}]))
+
 (defn user-message-content
   [{:keys [content-type quoted-message content outgoing outgoing-status] :as message-data}
    {:keys [chat-id] :as context}]
@@ -112,11 +119,7 @@
                                     (reset! show-delivery-state? true)
                                     (js/setTimeout #(reset! show-delivery-state? false)
                                                    delivery-state-showing-time-ms)))
-           :on-long-press       (fn []
-                                  (rf/dispatch [:dismiss-keyboard])
-                                  (rf/dispatch [:bottom-sheet/show-sheet
-                                                {:content (drawers/reactions-and-actions message-data
-                                                                                         context)}]))}
+           :on-long-press       #(on-long-press message-data context)}
           [rn/view {:style {:padding-vertical 8}}
            (when (and (seq response-to) quoted-message)
              [old-message/quoted-message {:message-id response-to :chat-id chat-id} quoted-message])
@@ -130,29 +133,31 @@
              [author message-data]
              (case content-type
 
-               constants/content-type-text    [not-implemented/not-implemented
-                                               [content.text/text-content message-data context]]
+               constants/content-type-text
+               [content.text/text-content message-data context]
 
-               constants/content-type-emoji   [not-implemented/not-implemented
-                                               [old-message/emoji message-data]]
+               constants/content-type-emoji
+               [old-message/emoji message-data]
 
-               constants/content-type-sticker [not-implemented/not-implemented
-                                               [old-message/sticker message-data]]
+               constants/content-type-sticker
+               [old-message/sticker message-data]
 
-               constants/content-type-image   [image/image-message 0 message-data context]
+               constants/content-type-audio
+               [old-message/audio message-data]
 
-               constants/content-type-audio   [not-implemented/not-implemented
-                                               [old-message/audio message-data]]
+               constants/content-type-image
+               [image/image-message 0 message-data context on-long-press]
 
-               constants/content-type-album   [album/album-message message-data context]
+               constants/content-type-album
+               [album/album-message message-data context on-long-press]
 
-               [not-implemented/not-implemented [content.unknown/unknown-content message-data]])
+               [content.unknown/unknown-content message-data])
              (when @show-delivery-state?
                [status/status outgoing-status])]]]])))])
 
 (defn message-with-reactions
   [{:keys [pinned pinned-by mentioned in-pinned-view? content-type
-           last-in-group? message-id]
+           last-in-group? message-id messages-ids]
     :as   message-data}
    {:keys [chat-id] :as context}]
   [rn/view
@@ -165,4 +170,4 @@
         content-type)
      [system-message-content message-data]
      [user-message-content message-data context])
-   [reactions/message-reactions-row chat-id message-id]])
+   [reactions/message-reactions-row chat-id message-id messages-ids]])

src/status_im2/contexts/chat/photo_selector/style.cljs

@@ -29,7 +29,8 @@
    :position           :absolute
    :right              20})
 
-(def camera-button-container
+(defn close-button-container
+  []
   {:background-color (colors/theme-colors colors/neutral-10 colors/neutral-80)
    :width            32
    :height           32

src/status_im2/contexts/chat/photo_selector/view.cljs

@@ -130,7 +130,7 @@
                   [rn/touchable-opacity
                    {:active-opacity 1
                     :on-press       #(rf/dispatch [:navigate-back])
-                    :style          style/camera-button-container}
+                    :style          (style/close-button-container)}
                    [quo/icon :i/close
                     {:size 20 :color (colors/theme-colors colors/black colors/white)}]])
                 [album-title true selected-album selected temporary-selected]

src/status_im2/contexts/communities/menus/request_to_join/style.cljs

@@ -36,8 +36,7 @@
    :margin-bottom 20})
 
 (def title-container
-  {:flex            1
-   :flex-direction  :row
+  {:flex-direction  :row
    :align-items     :center
    :justify-content :space-between})
 
@@ -56,10 +55,10 @@
   {:flex         1
    :margin-right 12})
 
-(def request-button
-  {:margin-top      32
-   :margin-bottom   16
-   :flex            1
+(defn bottom-container
+  [safe-area-insets]
+  {:padding-top     32
+   :padding-bottom  (:bottom safe-area-insets)
    :flex-direction  :row
    :align-items     :center
    :justify-content :space-evenly})

src/status_im2/contexts/communities/menus/request_to_join/view.cljs

@@ -1,9 +1,10 @@
 (ns status-im2.contexts.communities.menus.request-to-join.view
-  (:require [quo.react-native :as rn]
-            [quo2.core :as quo]
+  (:require [react-native.core :as rn]
+            [react-native.safe-area :as safe-area]
             [reagent.core :as reagent]
-            [utils.i18n :as i18n]
             [status-im2.contexts.communities.menus.request-to-join.style :as style]
+            [quo2.core :as quo]
+            [utils.i18n :as i18n]
             [utils.re-frame :as rf]
             [utils.requests :as requests]))
 
@@ -73,60 +74,72 @@
     :render-fn                         community-rule-item}])
 
 (defn request-to-join
-  [{:keys [permissions name id images
-           can-join? can-request-access?
+  [{:keys [permissions
+           name
+           id
+           images
+           can-join?
+           can-request-access?
            requested-to-join-at]}]
-  (let [agreed-to-rules? (reagent/atom false)
-        is-open?         (not= 3 (:access permissions))]
-    (fn []
-      [rn/scroll-view {:style style/page-container}
-       [rn/view
-        {:style style/title-container}
+  (let [agreed-to-rules? (reagent/atom false)]
+    [safe-area/consumer
+     (fn [insets]
+       [:f>
+        (fn []
+          (let [{window-height :height} (rn/use-window-dimensions)
+                is-open?                (not= 3 (:access permissions))]
+            [rn/scroll-view {:style {:max-height (- window-height (:top insets))}}
+             [rn/view style/page-container
+              [rn/view
+               {:style style/title-container}
 
-        [quo/text
-         {:accessibility-label :communities-join-community
-          :weight              :semi-bold
-          :size                :heading-1}
-         (request-to-join-text is-open?)]
-        [rn/view
-         {:style style/request-icon}
-         [quo/icon :i/info]]]
-       [quo/context-tag
-        {:style
-         {:margin-right :auto
-          :margin-top   8}}
-        (:thumbnail images) name]
-       [quo/text
-        {:style               {:margin-top 24}
-         :accessibility-label :communities-rules-title
-         :weight              :semi-bold
-         :size                :paragraph-1}
-        (i18n/label :t/community-rules)]
-       [community-rules-list community-rules]
+               [quo/text
+                {:accessibility-label :communities-join-community
+                 :weight              :semi-bold
+                 :size                :heading-1}
+                (request-to-join-text is-open?)]
+               [rn/view
+                {:style style/request-icon}
+                [quo/icon :i/info]]]
+              [quo/context-tag
+               {:style
+                {:margin-right :auto
+                 :margin-top   8}}
+               (:thumbnail images) name]
+              [quo/text
+               {:style               {:margin-top 24}
+                :accessibility-label :communities-rules-title
+                :weight              :semi-bold
+                :size                :paragraph-1}
+               (i18n/label :t/community-rules)]
 
-       [quo/disclaimer
-        {:accessibility-label :rules-disclaimer-checkbox
-         :container-style     {:margin-top 20}
-         :on-change           #(swap! agreed-to-rules? not)}
-        (i18n/label :t/accept-community-rules)]
-       [rn/view
-        {:style style/request-button}
-        [quo/button
-         {:accessibility-label :cancel
-          :on-press            #(rf/dispatch [:bottom-sheet/hide])
-          :type                :grey
-          :style               style/cancel-button} (i18n/label :t/cancel)]
-        [quo/button
-         {:accessibility-label :join-community-button
-          :on-press            (fn []
-                                 (if can-join?
-                                   (do
-                                     (rf/dispatch [:communities/join id])
-                                     (rf/dispatch [:bottom-sheet/hide]))
-                                   (do (and can-request-access?
-                                            (not (pos? requested-to-join-at))
-                                            (requests/can-request-access-again? requested-to-join-at))
-                                       (rf/dispatch [:communities/request-to-join id])
-                                       (rf/dispatch [:bottom-sheet/hide]))))
-          :disabled            (not @agreed-to-rules?)
-          :style               {:flex 1}} (request-to-join-text is-open?)]]])))
+              [community-rules-list community-rules]
+
+              [quo/disclaimer
+               {:accessibility-label :rules-disclaimer-checkbox
+                :container-style     {:margin-top 20}
+                :on-change           #(swap! agreed-to-rules? not)}
+               (i18n/label :t/accept-community-rules)]
+
+              [rn/view {:style (style/bottom-container insets)}
+               [quo/button
+                {:accessibility-label :cancel
+                 :on-press            #(rf/dispatch [:bottom-sheet/hide])
+                 :type                :grey
+                 :style               style/cancel-button} (i18n/label :t/cancel)]
+
+               [quo/button
+                {:accessibility-label :join-community-button
+                 :on-press            (fn []
+                                        (if can-join?
+                                          (do
+                                            (rf/dispatch [:communities/join id])
+                                            (rf/dispatch [:bottom-sheet/hide]))
+                                          (do (and can-request-access?
+                                                   (not (pos? requested-to-join-at))
+                                                   (requests/can-request-access-again?
+                                                    requested-to-join-at))
+                                              (rf/dispatch [:communities/request-to-join id])
+                                              (rf/dispatch [:bottom-sheet/hide]))))
+                 :disabled            (not @agreed-to-rules?)
+                 :style               {:flex 1}} (request-to-join-text is-open?)]]]]))])]))

src/status_im2/contexts/communities/overview/view.cljs

@@ -119,9 +119,10 @@
        [quo/button
         {:on-press                  #(rf/dispatch
                                       [:bottom-sheet/show-sheet
-                                       {:content        (fn [] [join-menu/request-to-join
-                                                                community])
-                                        :content-height 300}])
+                                       {:content                   (fn [] [join-menu/request-to-join
+                                                                           community])
+                                        :bottom-safe-area-spacing? false
+                                        :content-height            300}])
          :accessibility-label       :show-request-to-join-screen-button
          :override-background-color community-color
          :style                     style/join-button

src/status_im2/subs/chat/messages.cljs

@@ -111,22 +111,39 @@
 (defn albumize-messages
   [messages]
   (get
-   (reduce (fn [{:keys [messages albums]} message]
-             (let [album-id (:album-id message)
-                   albums   (cond-> albums album-id (update album-id conj message))
-                   messages (if album-id
-                              (conj (filterv #(not= album-id (:album-id %)) messages)
-                                    {:album        (get albums album-id)
-                                     :album-id     album-id
-                                     :albumize?    (:albumize? message)
-                                     :message-id   album-id
-                                     :content-type constants/content-type-album})
-                              (conj messages message))]
-               {:messages messages
-                :albums   albums}))
-           {:messages []
-            :albums   {}}
-           messages)
+   (reduce
+    (fn [{:keys [messages albums]} message]
+      (let [album-id  (:album-id message)
+            ;; check if this image is the first image in an album (which is not albumized yet)
+            add-text? (when (and album-id (not (:albumize? message)) (> (count (get albums album-id)) 0))
+                        (not (some #(= false %)
+                                   (mapv #(< (:timestamp message) (:timestamp %))
+                                         (get albums album-id)))))
+            albums    (cond-> albums album-id (update album-id conj message))
+            ;; keep text of the first album image only
+            message   (if (or add-text? (<= (count (get albums album-id)) 1))
+                        message
+                        (assoc-in message [:content :text] nil))
+            messages  (if (and (> (count (get albums album-id)) 1) (:albumize? message))
+                        (conj (filterv #(not= album-id (:album-id %)) messages)
+                              {:album        (get albums album-id)
+                               :album-id     album-id
+                               :albumize?    (:albumize? message)
+                               :messages-ids (mapv :message-id (get albums album-id))
+                               :message-id   album-id
+                               :content-type constants/content-type-album})
+                        ;; remove text of other images in an album
+                        (if add-text?
+                          (conj (mapv #(when (= (:album-id %) album-id)
+                                         (assoc-in % [:content :text] nil))
+                                      messages)
+                                message)
+                          (conj messages message)))]
+        {:messages messages
+         :albums   albums}))
+    {:messages []
+     :albums   {}}
+    messages)
    :messages))
 
 (re-frame/reg-sub

src/status_im2/subs/chat/messages_test.cljs

@@ -10,7 +10,9 @@
   [{:message-id "0x111" :album-id "abc" :albumize? true}
    {:message-id "0x222" :album-id "abc" :albumize? true}
    {:message-id "0x333" :album-id "abc" :albumize? true}
-   {:message-id "0x444" :album-id "abc" :albumize? true}])
+   {:message-id "0x444" :album-id "abc" :albumize? true}
+   {:message-id "0x555" :album-id "edf" :timestamp 10 :content {:text "Wassup!"}}
+   {:message-id "0x666" :album-id "edf" :timestamp 20 :content {:text "Wassup!"}}])
 
 (def messages-albumized-state
   [{:album        [{:message-id "0x444" :album-id "abc" :albumize? true}
@@ -20,7 +22,10 @@
     :album-id     "abc"
     :albumize?    true
     :message-id   "abc"
-    :content-type constants/content-type-album}])
+    :messages-ids ["0x444" "0x333" "0x222" "0x111"]
+    :content-type constants/content-type-album}
+   {:message-id "0x555" :album-id "edf" :timestamp 10 :content {:text "Wassup!"}}
+   {:message-id "0x666" :album-id "edf" :timestamp 20 :content {:text nil}}])
 
 (deftest albumize-messages
   (testing "Finding albums in the messages list"

src/status_im2/subs/contact.cljs

@@ -76,16 +76,10 @@
  :contacts/active-sections
  :<- [:contacts/active]
  (fn [contacts]
-   (-> (reduce
-        (fn [acc contact]
-          (let [first-char (first (:alias contact))]
-            (if (get acc first-char)
-              (update-in acc [first-char :data] #(conj % contact))
-              (assoc acc first-char {:title first-char :data [contact]}))))
-        {}
-        contacts)
-       sort
-       vals)))
+   (->> contacts
+        (group-by #(string/upper-case (ffirst (:two-names %))))
+        sort
+        (mapv (fn [[title items]] {:title title :data items})))))
 
 (re-frame/reg-sub
  :contacts/grouped-by-first-letter

src/status_im2/subs/contact_test.cljs

@@ -95,7 +95,8 @@
              :names                 {:nickname         nil
                                      :display-name     ""
                                      :three-words-name "Fake Slim Shady"
-                                     :ens-name         "@slim.shady"}
+                                     :ens-name         "slim.shady"}
+             :two-names             ["slim.shady" "Fake Slim Shady"]
              :has-added-us          true
              :contact-request-state 1}]}
    {:title "I"
@@ -124,7 +125,8 @@
              :names                 {:nickname         nil
                                      :display-name     ""
                                      :three-words-name "Instant noodles"
-                                     :ens-name         "@slim.shady"}
+                                     :ens-name         "slim.shady"}
+             :two-names             ["slim.shady" "Instant noodles"]
              :has-added-us          true
              :contact-request-state 1}]}
    {:title "R"
@@ -153,7 +155,8 @@
              :names                 {:nickname         nil
                                      :display-name     ""
                                      :three-words-name "Real Slim Shady"
-                                     :ens-name         "@slim.shady"}
+                                     :ens-name         "slim.shady"}
+             :two-names             ["slim.shady" "Real Slim Shady"]
              :has-added-us          true
              :contact-request-state 1}]}])
 

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.130.0",
-    "commit-sha1": "dea21f440a9f630c4b8324fcde0b016d6c3fc02b",
-    "src-sha256": "1w9iyigj0rkqfnyb8m9w802r1lx1cydg41p8qb7hnsry2bgrfk97"
+    "version": "v0.131.7+hotfix.1",
+    "commit-sha1": "47263752fca6d2efab08430aa71d33296374b805",
+    "src-sha256": "1fsv1nlqw0rln01alzr5bqlh9mkh2jjwxg1binfiwq34fk91r4sq"
 }