fix: android bottom padding

.github/github-bot.yml

@@ -5,6 +5,7 @@ project-board:
   min-reviewers: 1
   tested-pr-label-name: 'Tested - Issues'
   contributor-column-name: 'CONTRIBUTOR'
+  to-rebase-column-name: 'TO REBASE'
   review-column-name: 'REVIEW'
   test-column-name: 'E2E Tests'
 

Makefile

@@ -218,18 +218,23 @@ release-android: keystore build-android ##@build Build signed Android APK
 
 release-ios: export TARGET := ios
 release-ios: export BUILD_ENV ?= prod
-release-ios: watchman-clean ios-clean jsbundle ##@build Build release for iOS release
-	xcodebuild \
-		-scheme StatusIm \
-		-configuration Release \
-		-workspace ios/StatusIm.xcworkspace \
-		-destination 'generic/platform=iOS' \
-		-UseModernBuildSystem=N clean archive
+release-ios: watchman-clean ##@build Build release for iOS release
+	@git clean -dxf -f target/ios && \
+	$(MAKE) jsbundle-ios && \
+	xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive
 
-jsbundle: SHELL := /bin/sh
-jsbundle: export BUILD_ENV ?= prod
-jsbundle: ##@build Build JavaScript and Clojurescript bundle for iOS and Android
-	nix/scripts/build.sh targets.mobile.jsbundle
+jsbundle-android: SHELL := /bin/sh
+jsbundle-android: export TARGET := android
+jsbundle-android: export BUILD_ENV ?= prod
+jsbundle-android: ##@jsbundle Compile JavaScript and Clojurescript into app directory
+	# Call nix-build to build the 'targets.mobile.android.jsbundle' attribute and copy the.js files to the project root
+	nix/scripts/build.sh targets.mobile.android.jsbundle && \
+	mv result/*.js ./
+
+jsbundle-ios: export TARGET := ios
+jsbundle-ios: export BUILD_ENV ?= prod
+jsbundle-ios: ##@jsbundle Compile JavaScript and Clojure into index.ios.js
+	yarn shadow-cljs release mobile
 
 #--------------
 # status-go lib
@@ -360,7 +365,6 @@ component-test: ##@test Run component tests once in NodeJS
 	yarn shadow-cljs compile component-test && \
 	jest --config=test/jest/jest.config.js
 
-#--------------
 # Other
 #--------------
 
@@ -369,10 +373,6 @@ geth-connect: ##@other Connect to Geth on the device
 	adb forward tcp:8545 tcp:8545 && \
 	build/bin/geth attach http://localhost:8545
 
-ios-clean: SHELL := /bin/sh
-ios-clean: ##@prepare Clean iOS build artifacts
-	git clean -dxf -f target/ios
-
 android-clean: export TARGET := gradle
 android-clean: ##@prepare Clean Gradle state
 	git clean -dxf -f ./android/app/build; \

VERSION

@@ -1 +1 @@
-1.23.0
+1.22.0

ci/Jenkinsfile.android

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.8'
+library 'status-jenkins-lib@v1.7.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -49,6 +49,7 @@ pipeline {
     stage('Prep') {
       steps {
         script {
+          utils.doGitRebasePR()
           utils.symlinkEnv()
           println("Build Number: ${utils.genBuildNumber()}")
         }

ci/Jenkinsfile.combined

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

ci/Jenkinsfile.ios

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.8'
+library 'status-jenkins-lib@v1.7.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -48,6 +48,7 @@ pipeline {
     stage('Prep') {
       steps {
         script {
+          utils.doGitRebasePR()
           utils.symlinkEnv()
           println("Build Number: ${utils.genBuildNumber()}")
         }

ci/Jenkinsfile.nix-cache

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

ci/Jenkinsfile.tests

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.8'
+library 'status-jenkins-lib@v1.7.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -41,6 +41,13 @@ pipeline {
   }
 
   stages {
+    stage('Prep') {
+      steps {
+        script {
+          utils.doGitRebasePR()
+        }
+      }
+    }
     stage('Checks') {
       parallel {
         stage('Lint') {

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.8'
+library 'status-jenkins-lib@v1.7.3'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-prs

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.8'
+library 'status-jenkins-lib@v1.7.3'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.8'
+library 'status-jenkins-lib@v1.7.3'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.playstore-meta

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

ci/tools/Jenkinsfile.xcode-clean

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.8'
+library 'status-jenkins-lib@v1.7.3'
 
 pipeline {
   agent {

doc/new-guidelines.md

@@ -365,43 +365,6 @@ dispatch.
     (str "Hello " username)]])
 ```
 
-### Registering effects
-
-When registering re-frame effects (`reg-fx`), prefer to expose a data-only
-interface because that will allow event handlers to stay pure.
-
-For instance, if an effect needs a `on-success` callback, allow it to receive a
-*re-frame event vector*. This approach is used by us in the [json-rpc/call
-effect](src/status_im2/common/json_rpc/events.cljs), but also by third-party
-effects, such as https://github.com/Day8/re-frame-http-fx. For the complete
-rationale, see [PR #15936](https://github.com/status-im/status-mobile/pull/15936).
-
-### Using the effect `:json-rpc/call`
-
-Prefer the pure version of `:json-rpc/call` (no callbacks).
-
-```clojure
-;; not as good
-(rf/defn accept-contact-request
-  {:events [:activity-center.contact-requests/accept]}
-  [_ contact-id]
-  {:json-rpc/call
-   [{:method     "wakuext_acceptContactRequest"
-     :params     [{:id contact-id}]
-     :on-success #(rf/dispatch [:sanitize-messages-and-process-response %])
-     :on-error   #(rf/dispatch [:activity-center.contact-requests/accept-error contact-id %])}]})
-
-;; better
-(rf/defn accept-contact-request
-  {:events [:activity-center.contact-requests/accept]}
-  [_ contact-id]
-  {:json-rpc/call
-   [{:method     "wakuext_acceptContactRequest"
-     :params     [{:id contact-id}]
-     :on-success [:sanitize-messages-and-process-response]
-     :on-error   [:activity-center.contact-requests/accept-error contact-id]}]})
-```
-
 ### Registering event handlers
 
 Events must always be declared with the `utils.fx/defn` macro. Also, don't use

index.js

@@ -1,2 +1,2 @@
 import "node-libs-react-native/globals";
-import "./result/index.js";
+import "./app/index.js";

nix/DETAILS.md

@@ -55,12 +55,12 @@ The [`nix/scripts/shell.sh`](./scripts/shell.sh) script is essentially a wrapper
 
 # Building
 
-We will use the `make jsbundle` target as an example of a derivation you can build using Nix:
+We will use the `make jsbundle-android` target as an example of a derivation you can build using Nix:
 
-1. `make jsbundle` is called by developer
-2. `make` calls `nix/scripts/build.sh targets.mobile.jsbundle`
-3. [`build.sh`](/nix/scripts/build.sh) calls `nix-build --attr targets.mobile.jsbundle` with extra arguments
-4. `nix-build` builds the derivation from [`nix/mobile/jsbundle/default.nix`](/nix/mobile/jsbundle/default.nix)
+1. `make jsbundle-android` is called by developer
+2. `make` calls `nix/scripts/build.sh targets.mobile.android.jsbundle`
+3. [`build.sh`](/nix/scripts/build.sh) calls `nix-build --attr targets.mobile.android.jsbundle` with extra arguments
+4. `nix-build` builds the derivation from [`nix/mobile/android/jsbundle/default.nix`](/nix/mobile/android/jsbundle/default.nix)
 
 The same can be done for other targets like `targets.mobile.android.release`.
 Except in that case extra arguments are required which is why the [`scripts/release-android.sh`](/scripts/release-android.sh) is used in the `make release-android` target.

nix/mobile/android/default.nix

@@ -1,10 +1,14 @@
 { pkgs, deps, callPackage, mkShell
-, jsbundle, status-go, androidPkgs, androidShell }:
+, status-go, androidPkgs, androidShell }:
 
-rec {
-  release = callPackage ./release.nix {
-    inherit jsbundle status-go;
-  };
+let
+  # Import a jsbundle compiled out of clojure codebase
+  jsbundle = callPackage ./jsbundle { };
+
+  release = callPackage ./release.nix { inherit jsbundle status-go; };
+in {
+  # TARGETS
+  inherit release jsbundle;
 
   shell = mkShell {
     buildInputs = with pkgs; [

nix/mobile/android/jsbundle/default.nix

@@ -8,9 +8,9 @@
 { secretsFile ? "" }:
 
 stdenv.mkDerivation {
-  name = "status-mobile-jsbundle";
+  name = "status-mobile-build-jsbundle-android";
   src =
-    let path = ./../../..;
+    let path = ./../../../..;
     # We use builtins.path so that we can name the resulting derivation,
     # otherwise the name would be taken from the checkout directory,
     # which is outside of our control inherit path;
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
           ignoreVCS = false;
           include = [ 
             "VERSION" "BUILD_NUMBER" "scripts/version/.*"
-            "src/.*" "shadow-cljs.edn"
+            "src/.*" "shadow-cljs.edn" "index.js"
             # I want to avoid including the whole .git directory
             ".git/HEAD" ".git/objects" ".git/refs/heads/.*"
             # shadow-cljs expects these for deps resolution
@@ -77,6 +77,6 @@ stdenv.mkDerivation {
   '';
   installPhase = ''
     mkdir -p $out
-    cp -r result/* $out/
+    cp -r index.js app $out/
   '';
 }

nix/mobile/android/release.nix

@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
       root = path;
       include = [
         "package.json" "yarn.lock" "metro.config.js" "babel.config.js"
-        "resources/.*" "translations/.*" "src/js/.*" "index.js"
+        "resources/.*" "translations/.*" "src/js/.*"
         "modules/react-native-status/android.*" "android/.*"
         envFileName "VERSION" "status-go-version.json" "react-native.config.js"
       ];
@@ -94,10 +94,8 @@ in stdenv.mkDerivation rec {
     # Export all vars from .env file
     export $(cut -d= -f1 .env)
 
-    # Symlink React Native entrypoint.
-    cp -Lr ${builtJsBundle} ./result
-    pwd
-    find -L result
+    # Copy index.js and app/ input files
+    cp -ra --no-preserve=ownership ${builtJsBundle}/* ./
 
     # Copy android/ directory
     mkdir -p ./android/build

nix/mobile/default.nix

@@ -3,10 +3,7 @@
 let
   fastlane = callPackage ./fastlane { };
 
-  jsbundle = callPackage ./jsbundle { };
-
   android = callPackage ./android {
-    inherit jsbundle;
     status-go = status-go.mobile.android;
   };
 
@@ -29,5 +26,5 @@ in {
   };
 
   # TARGETS
-  inherit android ios fastlane jsbundle;
+  inherit android ios fastlane;
 }

package.json

@@ -19,7 +19,7 @@
     "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.3-status",
     "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#refs/tags/v4.0.4-status.0",
     "@react-native-community/clipboard": "^1.2.2",
-    "@react-native-community/hooks": "^3.0.0",
+    "@react-native-community/hooks": "^2.5.1",
     "@react-native-community/masked-view": "^0.1.6",
     "@react-native-community/netinfo": "^4.4.0",
     "@react-native-community/push-notification-ios": "^1.4.1",