Merge branch 'develop' into issue-13832

Makefile

@@ -176,7 +176,7 @@ fdroid-fix-tmp: ##@prepare Fix TMPDIR permissions so Vagrant user is the owner
 
 fdroid-build-env: fdroid-max-watches fdroid-nix-dir fdroid-fix-tmp ##@prepare Setup build environment for F-Droud build
 
-fdroid-pr: export TARGET := android
+fdroid-pr: export TARGET := android-sdk
 fdroid-pr: ##@prepare Create F-Droid release PR
 ifndef APK
 	$(error APK env var not defined)
@@ -314,7 +314,7 @@ test: ##@test Run tests once in NodeJS
 # Other
 #--------------
 
-geth-connect: export TARGET := android-env
+geth-connect: export TARGET := android-sdk
 geth-connect: ##@other Connect to Geth on the device
 	adb forward tcp:8545 tcp:8545 && \
 	build/bin/geth attach http://localhost:8545
@@ -324,22 +324,22 @@ android-clean: ##@prepare Clean Gradle state
 	git clean -dxf -f ./android/app/build; \
 	[[ -d android/.gradle ]] && cd android && ./gradlew clean
 
-android-ports: export TARGET := android-env
+android-ports: export TARGET := android-sdk
 android-ports: ##@other Add proxies to Android Device/Simulator
 	adb reverse tcp:8081 tcp:8081 && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
 	adb forward tcp:5561 tcp:5561
 
-android-devices: export TARGET := android-env
+android-devices: export TARGET := android-sdk
 android-devices: ##@other Invoke adb devices
 	adb devices
 
-android-logcat: export TARGET := android-env
+android-logcat: export TARGET := android-sdk
 android-logcat: ##@other Read status-mobile logs from Android phone using adb
 	adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG   :' -e 'Go      :' -e 'GoLog   :' -e 'libc    :'
 
-android-install: export TARGET := android-env
+android-install: export TARGET := android-sdk
 android-install: export BUILD_TYPE ?= release
 android-install: ##@other Install APK on device using adb
 	adb install result/app-$(BUILD_TYPE).apk

android/app/build.gradle

@@ -76,13 +76,22 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
  *   extraPackagerArgs: []
  * ]
  */
+
+/*
+ Enabling Hermes on x86 devices is crashing the app after a few reloads,
+ this flag can be used to disable Hermes while building app.
+ https://github.com/status-im/status-mobile/issues/14031
+ */
+
+def disableHermes = System.getenv('DISABLE_HERMES') == 'true'
+
 project.ext.react = [
     nodeExecutableAndArgs: ["node", "--max-old-space-size=16384"],
     entryFile: "index.js",
     /* NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices,
      *       to guard against a hang in the UI thread after invoking status-go.
      * Also a clean and rebuild is required when changing this. */
-    enableHermes: true,
+    enableHermes: !disableHermes,
     /* Disable 'The first definition was here.' warnings */
     hermesFlagsRelease: ["-w"],
     bundleInPr: true,

ci/Jenkinsfile.android

@@ -1,10 +1,10 @@
-library 'status-jenkins-lib@v1.5.5'
+library 'status-jenkins-lib@v1.5.7'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'linux && x86_64 && nix-2.8' }
+  agent { label 'linux && x86_64 && nix-2.11' }
 
   options {
     timestamps()

ci/Jenkinsfile.combined

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

ci/Jenkinsfile.ios

@@ -1,10 +1,10 @@
-library 'status-jenkins-lib@v1.5.5'
+library 'status-jenkins-lib@v1.5.7'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'macos && x86_64 && nix-2.8 && xcode-13.4' }
+  agent { label 'macos && x86_64 && nix-2.11 && xcode-13.4' }
 
   parameters {
     string(

ci/Jenkinsfile.nix-cache

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

ci/Jenkinsfile.tests

@@ -1,10 +1,10 @@
-library 'status-jenkins-lib@v1.5.5'
+library 'status-jenkins-lib@v1.5.7'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'linux && x86_64 && nix-2.8' }
+  agent { label 'linux && x86_64 && nix-2.11' }
 
   options {
     timestamps()

ci/tests/Jenkinsfile.e2e-prs

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.5'
+library 'status-jenkins-lib@v1.5.7'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.playstore-meta

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

doc/FDROID.md

@@ -84,7 +84,8 @@ At the bottom of the file you should also update the following keys:
 * `CurrentVersion` - Same as the new `versionName` added
 * `CurrentVersionCode` - Same as the `versionCode` added
 
-Then submit a merge request to the [fdroid/fdroiddata](https://gitlab.com/fdroid/fdroiddata) repository.
+Then submit a merge request with `Draft: ` prefix to the [fdroid/fdroiddata](https://gitlab.com/fdroid/fdroiddata) repository.
+Prefix is necessary to avoid F-Droid people merging the PR before it's ready.
 
 :warning: __WARNING__: Currently GitLab PR builds will fail due to running as `root` instead of `vagrant` and failing to install Nix.
 

doc/TROUBLESHOOTING.md

@@ -97,3 +97,32 @@ System's local adb and Nix's adb differ. As adb include of server/client process
 Always use respective `make` commands, e.g. `make android-ports`, `make android-devices`, etc.
 
 Alternatively, run adb commands only from `make shell TARGET=android` shell. Don't forget the `TARGET=android` env var setting - otherwise `adb` will still be selected from the system's default location. You can double-check this by running `which adb`.
+
+# Hot Reloading Crashes
+## APP Crashes on reloading changes
+
+### Cause
+Status-mobile uses `shadow-cljs` for hot reloading changes and uses its own [reloader](https://github.com/status-im/status-mobile/blob/develop/src/status_im/reloader.cljs) for updating them in the running app. If react-native's fast refresh is also enabled then it creates conflicts and crashes the app.
+
+### Solution
+Open react native's [In-App Developer Menu](https://reactnative.dev/docs/debugging#accessing-the-in-app-developer-menu) and press "Disable Fast Refresh" or "Disable Hot Reloading"
+
+## App Crashes after few reloads
+
+### Cause
+For x86 CPU architecture Android Devices, Hermes is creating the issue and the app crashes after a few reloads.
+([Original Issue](https://github.com/status-im/status-mobile/issues/14031))
+
+<details>
+  <summary>How to Find CPU architecture</summary>
+
+  CPU architecture of android device can be found using
+  - `adb shell uname -m` or
+  - `adb shell getprop ro.product.cpu.abilist`
+
+</details>
+
+### Solution
+Disable Hermes while building the app
+
+`make run-android DISABLE_HERMES=true`

nix/KNOWN_ISSUES.md

@@ -20,14 +20,10 @@ And use `sudo sysctl --system` to load these new settings.
 
 ### Multi-User Installation
 
-The other reason why this error could appear are limits fo `nix-daemon` service:
-https://github.com/NixOS/nix/issues/6007
+This has been fixed in Nix `2.9.0`:
 
-Since Systemd services ignore system-wide limits you will have to add the following line:
-```
-LimitNOFILE=4096:1048576
-```
-To the `/etc/systemd/system/nix-daemon.service` service definition.
+* https://github.com/NixOS/nix/issues/6007
+* https://github.com/NixOS/nix/pull/6553
 
 ## Cache Downloads Timing Out
 

nix/pkgs/android-sdk/shell.nix

@@ -1,7 +1,7 @@
 { mkShell, openjdk, androidPkgs }:
 
 mkShell {
-  name = "android-env-shell";
+  name = "android-sdk-shell";
   shellHook = ''
     export JAVA_HOME="${openjdk}"
 

nix/scripts/setup.sh

@@ -6,9 +6,9 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 source "${GIT_ROOT}/nix/scripts/lib.sh"
 source "${GIT_ROOT}/scripts/colors.sh"
 
-NIX_VERSION="2.8.0"
+NIX_VERSION="2.11.1"
 NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
-NIX_INSTALL_SHA256="f43bfedfca9151479462d8bc11f238615a2d52f19b14894d8e2b59980e75ef72"
+NIX_INSTALL_SHA256="4569a01dc5f62056f29f3195673bc3242fc70bf2474927fb5d8549c4d997402d"
 NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"
 
 install_nix() {

nix/shells.nix

@@ -56,8 +56,8 @@ let
       buildInputs = with pkgs; [ openjdk8 apksigner ];
     };
 
-    # for targets that need 'adb' and other SDK/NDK tools
-    android-env = pkgs.androidShell;
+    # for targets needing 'adb', 'apkanalyzer' and other SDK/NDK tools
+    android-sdk = pkgs.androidShell;
 
     # helpers for use with target argument
     ios = targets.mobile.ios.shell;

scripts/fdroid-pr.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-FDROIDATA_REPO_URL="https://gitlab.com/fdroid/fdroiddata.git"
+FDROIDDATA_REPO_URL="https://gitlab.com/fdroid/fdroiddata.git"
 WORKING_DIR="${HOME}/fdroid-release"
 
 source "${GIT_ROOT}/scripts/colors.sh"
@@ -43,7 +43,7 @@ fi
 
 VERSION_NAME=$(apkanalyzer manifest print "${APK_FILE}" | awk -F'"' '/android:versionName/{print $2}')
 if [[ -n "${VERSION_NAME}" ]]; then
-    log_data "Version Code: ${VERSION_NAME}"
+    log_data "Version Name: ${VERSION_NAME}"
 else
     log_warning "Failed to find version name." >&2; exit 1
 fi
@@ -55,19 +55,19 @@ else
     log_warning "Failed to find commit hash." >&2; exit 1
 fi
 
-CLONE_DIR="${WORKING_DIR}/fdroidata"
+CLONE_DIR="${WORKING_DIR}/fdroiddata"
 METADATA_FILE="${CLONE_DIR}/metadata/im.status.ethereum.yml"
 
 PREVIOUS_BRANCH=""
 if [[ -d "${CLONE_DIR}" ]]; then
-    log_info "Fetching: ${FDROIDATA_REPO_URL}"
+    log_info "Fetching: ${FDROIDDATA_REPO_URL}"
     cd "${CLONE_DIR}"
     PREVIOUS_BRANCH=$(git rev-parse --abbrev-ref HEAD)
     git checkout master
     git pull --force
 else
-    log_info "Cloning: ${FDROIDATA_REPO_URL}"
-    git clone -q --depth=1 "${FDROIDATA_REPO_URL}" "${CLONE_DIR}"
+    log_info "Cloning: ${FDROIDDATA_REPO_URL}"
+    git clone -q --depth=1 "${FDROIDDATA_REPO_URL}" "${CLONE_DIR}"
     cd "${CLONE_DIR}"
 fi
 
@@ -108,6 +108,6 @@ git add ${METADATA_FILE}
 git commit -m "${COMMIT_MESSAGE}"
 
 log_info "SUCCESS"
-log_notice "Now add your fork of fdroidata as a remote to the repository and push."
+log_notice "Now add your fork of fdroiddata as a remote to the repository and push."
 log_notice "Then create a Merge Request from the branch in your fork."
 log_notice "Repo path: ${BLD}${CLONE_DIR}${RST}"

src/quo/components/list/item.cljs

@@ -44,7 +44,7 @@
                :text-color         (:text-02 @colors/theme)}
     :light    {:icon-color         quo2.colors/neutral-50
                :icon-bg-color      quo2.colors/white
-               :text-color         quo2.colors/black
+               :text-color         quo2.colors/neutral-100
                :active-background  quo2.colors/neutral-10
                :passive-background quo2.colors/white}
     :dark     {:icon-color         quo2.colors/neutral-40

src/quo/previews/preview.cljs

@@ -39,6 +39,13 @@
 (def label-style {:flex          0.4
                   :padding-right 8})
 
+(defn label-view [state label]
+  [rn/view {:style label-style}
+   [quo/text
+    (when-let [label-color (:preview-label-color @state)]
+      {:style {:color label-color}})
+    label]])
+
 (defn modal-container []
   {:flex               1
    :justify-content    :center
@@ -56,8 +63,7 @@
   [{:keys [label key state]}]
   (let [state* (reagent/cursor state [key])]
     [rn/view {:style container}
-     [rn/view {:style label-style}
-      [quo/text label]]
+     [label-view state label]
      [rn/view {:style {:flex-direction   :row
                        :flex             0.6
                        :border-radius    4
@@ -80,8 +86,7 @@
   [{:keys [label key state]}]
   (let [state* (reagent/cursor state [key])]
     [rn/view {:style container}
-     [rn/view {:style label-style}
-      [quo/text label]]
+     [label-view state label]
      [rn/view {:style {:flex 0.6}}
       [quo/text-input {:value          @state*
                        :show-cancel    false
@@ -102,8 +107,7 @@
       (let [state*   (reagent/cursor state [key])
             selected (value-for-key @state* options)]
         [rn/view {:style container}
-         [rn/view {:style label-style}
-          [quo/text label]]
+         [label-view state label]
          [rn/view {:style {:flex 0.6}}
           [rn/modal {:visible              @open
                      :on-request-close     #(reset! open false)
@@ -146,7 +150,8 @@
             [quo/text "↓"]]]]]))))
 
 (defn customizer [state descriptors]
-  [rn/view {:style {:flex 1}}
+  [rn/view {:style              {:flex 1}
+            :padding-horizontal 16}
    (doall
     (for [{:keys [key type]
            :as   desc} descriptors

src/quo2/components/avatars/channel_avatar.cljs

@@ -5,9 +5,8 @@
             [quo2.components.markdown.text :as text]
             [quo.theme :as theme]))
 
-(defn channel-avatar [{:keys [big? lock-status emoji-background-color emoji]}]
-  (let [locked?      (= :locked lock-status)
-        lock-exists? (and lock-status (not= :none lock-status))
+(defn channel-avatar [{:keys [big? locked? emoji-background-color emoji]}]
+  (let [lock-exists? (some? locked?)
         dark?        (theme/dark?)]
     [rn/view {:style {:width            (if big? 32 24)
                       :height           (if big? 32 24)
@@ -24,11 +23,11 @@
       (when lock-exists?
         [rn/view {:style {:position         :absolute
                           :left             (if big?
-                                              13
-                                              5)
-                          :top              (if big?
                                               14
-                                              5)
+                                              8)
+                          :top              (if big?
+                                              15
+                                              8)
                           :background-color (if dark?
                                               colors/neutral-90
                                               colors/white)
@@ -40,6 +39,6 @@
           {:color           (if dark?
                               colors/neutral-40
                               colors/neutral-50)
-           :container-style {:width  16
-                             :height 16}
+           :container-style {:width  12
+                             :height 12}
            :size            12}]])]]))

src/quo2/components/avatars/user_avatar.cljs

@@ -67,7 +67,7 @@
                         :border-width border-width
                         :border-radius dimensions
                         :border-color (if dark?
-                                        colors/black
+                                        colors/neutral-100
                                         colors/white)
                         :position :absolute
                         :bottom bottom