e2e: temp check of not reported tests

nix/overlay.nix

@@ -32,6 +32,18 @@ in {
   # For parsing gradle.properties into an attrset
   gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
 
+  # Clojure formatting tool
+  zprint = super.zprint.override rec {
+    buildGraalvmNativeImage = args: super.buildGraalvmNativeImage ( args // rec {
+      inherit (args) pname;
+      version = "1.2.5";
+      src = self.fetchurl {
+        url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
+        sha256 = "sha256-PWdR5jqyzvTk9HoxqDldwtZNik34dmebBtZZ5vtva4A=";
+      };
+    });
+  };
+
   # Fix for missing libarclite_macosx.a in Xcode 14.3.
   # https://github.com/ios-control/ios-deploy/issues/580
   ios-deploy = super.darwin.ios-deploy.overrideAttrs (old: rec {
@@ -48,8 +60,8 @@ in {
   gradle = super.gradle_6;
   nodejs = super.nodejs-18_x;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
-  openjdk = super.openjdk11_headless;
-  xcodeWrapper = super.xcodeenv.composeXcodeWrapper {
+  openjdk = super.openjdk8_headless;
+  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
     version = "14.0";
     allowHigher = true;
   };

nix/pkgs.nix

@@ -11,10 +11,11 @@ let
   # We follow the master branch of official nixpkgs.
   nixpkgsSrc = fetchFromGitHub {
     name = "nixpkgs-source";
-    owner = "NixOS";
+    # FIXME: Fork used to get Cocoapods 1.12.0 and apksigner macOS build.
+    owner = "status-im";
     repo = "nixpkgs";
-    rev = "e7603eba51f2c7820c0a182c6bbb351181caa8e7";
-    sha256 = "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=";
+    rev = "d0c06fa3d3982a91aa01bd63ed84020cbde3d3ab";
+    sha256 = "sha256-8blvuUHnuf0hFr/PpBxVohJp5CaGXIXhgJlFN/cv7us=";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };

nix/pkgs/android-sdk/compose.nix

@@ -9,7 +9,7 @@
 # by setting android_sdk.accept_license = true.
 androidenv.composeAndroidPackages {
   toolsVersion = "26.1.1";
-  platformToolsVersion = "33.0.3";
+  platformToolsVersion = "33.0.2";
   buildToolsVersions = [ "30.0.0" ];
   platformVersions = [ "31" ];
   cmakeVersions = [ "3.18.1" ];

nix/pkgs/android-sdk/shell.nix

@@ -2,7 +2,6 @@
 
 mkShell {
   name = "android-sdk-shell";
-  buildInputs = [ openjdk ];
   shellHook = ''
     export JAVA_HOME="${openjdk}"
 

nix/pkgs/xcodeenv/compose-xcodewrapper.nix

@@ -0,0 +1,44 @@
+{ stdenv }:
+
+{ version ? "11.1"
+, allowHigher ? false
+, xcodeBaseDir ? "/Applications/Xcode.app" }:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "xcode-wrapper-${version}${if allowHigher then "-plus" else ""}";
+  # Fix 'xcodebuild: Operation not permitted' when 'sandbox=relaxed' is used.
+  # https://github.com/NixOS/nixpkgs/pull/228696
+  __noChroot = stdenv.isDarwin;
+  buildCommand = ''
+    mkdir -p $out/bin
+    cd $out/bin
+    ln -s /usr/bin/xcode-select
+    ln -s /usr/bin/security
+    ln -s /usr/bin/codesign
+    ln -s /usr/bin/xcrun
+    ln -s /usr/bin/plutil
+    ln -s /usr/bin/clang
+    ln -s /usr/bin/lipo
+    ln -s /usr/bin/file
+    ln -s /usr/bin/rev
+    ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
+    ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator"
+
+    cd ..
+    ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
+
+    # Check if we have the xcodebuild version that we want
+    currVer=$($out/bin/xcodebuild -version)
+    ${if allowHigher then ''
+    if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ]
+    '' else ''
+    if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ]
+    ''}
+    then
+        echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}"
+        exit 1
+    fi
+  '';
+}

nix/shell.nix

@@ -20,7 +20,7 @@ in mkShell {
     # lint specific utilities
     clj-kondo zprint
     # other nice to have stuff
-    yarn nodejs python310
+    yarn nodejs python27
   ] # and some special cases
     ++ lib.optionals stdenv.isDarwin [ cocoapods clang tcl ]
     ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ]

nix/shells.nix

@@ -57,7 +57,7 @@ let
 
     # for 'scripts/generate-keystore.sh'
     keytool = mkShell {
-      buildInputs = with pkgs; [ openjdk apksigner ];
+      buildInputs = with pkgs; [ openjdk8 apksigner ];
     };
 
     # for targets needing 'adb', 'apkanalyzer' and other SDK/NDK tools

src/quo2/components/inputs/title_input/view.cljs

@@ -40,8 +40,8 @@
           :default-value default-value
           :accessibility-label :profile-title-input
           :keyboard-appearance (theme/theme-value :light :dark override-theme)
-          :on-focus #(swap! focused? (constantly true))
-          :on-blur #(swap! focused? (constantly false))
+          :on-focus #(swap! focused? (fn [] true))
+          :on-blur #(swap! focused? (fn [] false))
           :input-mode :text
           :on-change-text on-change
           :editable (not disabled?)

src/status_im2/common/home/actions/view.cljs

@@ -71,7 +71,7 @@
                   :on-press            #(hide-sheet-and-dispatch [:chat.ui/clear-history chat-id])}])}]))
 
 (defn delete-chat-action
-  [{:keys [chat-id] :as item} inside-chat?]
+  [{:keys [chat-id] :as item}]
   (hide-sheet-and-dispatch
    [:show-bottom-sheet
     {:content (fn []
@@ -81,10 +81,7 @@
                   :context             item
                   :accessibility-label :delete-chat-confirm
                   :button-text         (i18n/label :t/delete-chat)
-                  :on-press            (fn []
-                                         (hide-sheet-and-dispatch [:chat.ui/remove-chat chat-id])
-                                         (when inside-chat?
-                                           (rf/dispatch [:navigate-back])))}])}]))
+                  :on-press            #(hide-sheet-and-dispatch [:chat.ui/remove-chat chat-id])}])}]))
 
 (defn leave-group-action
   [item chat-id]
@@ -97,10 +94,10 @@
                   :context             item
                   :accessibility-label :leave-group
                   :button-text         (i18n/label :t/leave-group)
-                  :on-press            (fn []
-                                         (hide-sheet-and-dispatch [:group-chats.ui/leave-chat-confirmed
-                                                                   chat-id])
-                                         (rf/dispatch [:navigate-back]))}])}]))
+                  :on-press            #(do
+                                          (rf/dispatch [:navigate-back])
+                                          (hide-sheet-and-dispatch [:group-chats.ui/leave-chat-confirmed
+                                                                    chat-id]))}])}]))
 
 (defn block-user-action
   [{:keys [public-key] :as item}]
@@ -155,10 +152,10 @@
           :add-divider?        true}))
 
 (defn delete-chat-entry
-  [item inside-chat?]
+  [item]
   (entry {:icon                :i/delete
           :label               (i18n/label :t/delete-chat)
-          :on-press            #(delete-chat-action item inside-chat?)
+          :on-press            #(delete-chat-action item)
           :danger?             true
           :accessibility-label :delete-chat
           :sub-label           nil
@@ -396,11 +393,11 @@
           :chevron?            false}))
 
 (defn destructive-actions
-  [{:keys [group-chat] :as item} inside-chat?]
+  [{:keys [group-chat] :as item}]
   [(clear-history-entry item)
    (if group-chat
      (leave-group-entry item nil)
-     (delete-chat-entry item inside-chat?))])
+     (delete-chat-entry item))])
 
 (defn notification-actions
   [{:keys [chat-id group-chat public?]} inside-chat?]
@@ -434,14 +431,14 @@
    [[(view-profile-entry chat-id)
      (edit-nickname-entry chat-id)]
     (notification-actions item inside-chat?)
-    (destructive-actions item inside-chat?)]])
+    (destructive-actions item)]])
 
 (defn private-group-chat-actions
   [item inside-chat?]
   [quo/action-drawer
    [(group-actions item inside-chat?)
     (notification-actions item inside-chat?)
-    (destructive-actions item inside-chat?)]])
+    (destructive-actions item)]])
 
 (defn contact-actions
   [{:keys [public-key] :as contact} {:keys [chat-id admin?] :as extra-data}]
@@ -474,4 +471,4 @@
     [quo/action-drawer
      [(when admin? [(edit-name-image-entry)])
       [(notifications-entry admin?)]
-      (destructive-actions group false)]]))
+      (destructive-actions group)]]))

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

@@ -9,16 +9,14 @@
             [status-im2.contexts.chat.messages.pin.banner.view :as pin.banner]
             [status-im2.constants :as constants]
             [utils.re-frame :as rf]
-            [utils.i18n :as i18n]
-            [status-im2.common.home.actions.view :as actions]))
+            [utils.i18n :as i18n]))
 
 (defn f-navigation-view
   [{:keys [scroll-y]}]
   (let [insets                   (safe-area/get-insets)
         status-bar-height        (:top insets)
         {:keys [group-chat chat-id chat-name emoji
-                chat-type]
-         :as   chat}             (rf/sub [:chats/current-chat-chat-view])
+                chat-type]}      (rf/sub [:chats/current-chat-chat-view])
         all-loaded?              (rf/sub [:chats/all-loaded? chat-id])
         display-name             (if (= chat-type constants/one-to-one-chat-type)
                                    (first (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
@@ -92,16 +90,11 @@
               :size            :paragraph-2
               :style           (style/header-online)}
              (i18n/label :t/online)])]]]
-       (when (not= chat-type constants/community-chat-type)
-         [rn/touchable-opacity
-          {:active-opacity      1
-           :style               (style/button-container {:margin-right 20})
-           :accessibility-label :options-button
-           :on-press            (fn []
-                                  (rf/dispatch [:dismiss-keyboard])
-                                  (rf/dispatch [:show-bottom-sheet
-                                                {:content (fn [] [actions/chat-actions chat true])}]))}
-          [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white)}]])]
+       [rn/touchable-opacity
+        {:active-opacity      1
+         :style               (style/button-container {:margin-right 20})
+         :accessibility-label :options-button}
+        [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white)}]]]
 
       [reanimated/view
        {:style (style/animated-pinned-banner all-loaded? banner-opacity-animation status-bar-height)}

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

@@ -96,7 +96,7 @@
       [rn/view
        {:style     style/featured-list-container
         :on-layout #(swap! view-size
-                      (fn [_]
+                      (fn []
                         (- (oops/oget % "nativeEvent.layout.width") 40)))}
        (when-not (= @view-size 0)
          [rn/flat-list

src/status_im2/contexts/onboarding/create_profile/view.cljs

@@ -73,11 +73,11 @@
        (let [will-show-listener (oops/ocall rn/keyboard
                                             "addListener"
                                             "keyboardWillShow"
-                                            #(swap! keyboard-shown? (constantly true)))
+                                            #(swap! keyboard-shown? (fn [] true)))
              will-hide-listener (oops/ocall rn/keyboard
                                             "addListener"
                                             "keyboardWillHide"
-                                            #(swap! keyboard-shown? (constantly false)))]
+                                            #(swap! keyboard-shown? (fn [] false)))]
          (fn []
            (fn []
              (oops/ocall will-show-listener "remove")

src/status_im2/navigation/options.cljs

@@ -87,12 +87,8 @@
                             :orientation              ["portrait"]
                             :backgroundColor          :transparent}
    :modalPresentationStyle :overCurrentContext
-   ;; disabled on iOS in debug mode:
-   ;; https://github.com/status-im/status-mobile/pull/16053#issuecomment-1568349702
-   :animations             (if (or platform/android? (not js/goog.DEBUG))
-                             {:showModal    {:alpha {:from 1 :to 1 :duration 300}}
-                              :dismissModal {:alpha {:from 1 :to 1 :duration 300}}}
-                             {})})
+   :animations             {:showModal    {:alpha {:from 1 :to 1 :duration 300}}
+                            :dismissModal {:alpha {:from 1 :to 1 :duration 300}}}})
 
 (def dark-screen
   (merge (statusbar true)

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.154.5",
-    "commit-sha1": "92b5d831fe25fd2b0397519a1073a53e0be87289",
-    "src-sha256": "004pm4k090lw35kbfag0wjs815y68k61h3g6kydzpzkbmxrrfzd9"
+    "version": "v0.154.2",
+    "commit-sha1": "5d62a9eef4a6676d62a9a51cdadea596d3d9a658",
+    "src-sha256": "148z0r8iyqanx91hgvbm7wx1nf82v2am1hyy6f892vmbc2y8axnx"
 }

test/appium/support/base_test_report.py

@@ -61,6 +61,7 @@ class BaseTestReport:
     def get_all_tests(self):
         tests = list()
         file_list = [f for f in os.listdir(self.TEST_REPORT_DIR) if f.endswith('json')]
+        print("REPORT FILES LIST:\n%s" % "\n".join(os.listdir(self.TEST_REPORT_DIR)))
         for file_name in file_list:
             file_path = os.path.join(self.TEST_REPORT_DIR, file_name)
             test_data = json.load(open(file_path))

test/appium/tests/base_test_case.py

@@ -15,7 +15,7 @@ from sauceclient import SauceException
 from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.support.wait import WebDriverWait
-from urllib3.exceptions import MaxRetryError
+from urllib3.exceptions import MaxRetryError, ProtocolError
 
 from support.api.network_api import NetworkApi
 from support.github_report import GithubHtmlReport
@@ -361,19 +361,20 @@ class SauceSharedMultipleDeviceTestCase(AbstractTestCase):
                 jobs[driver.session_id] = index + 1
         self.errors = Errors()
         test_suite_data.current_test.group_name = self.__class__.__name__
+        print("STARTING %s; test suite data: %s" % (method.__name__, [i.name for i in test_suite_data.tests]))
 
     def teardown_method(self, method):
         geth_names, geth_contents = [], []
         for driver in self.drivers:
             try:
-                self.print_sauce_lab_info(self.drivers[driver])
+                # self.print_sauce_lab_info(self.drivers[driver])
                 self.add_alert_text_to_report(self.drivers[driver])
                 geth_names.append(
                     '%s_geth%s.log' % (test_suite_data.current_test.name, str(self.drivers[driver].number)))
                 geth_contents.append(self.pull_geth(self.drivers[driver]))
 
-            except (WebDriverException, AttributeError, RemoteDisconnected):
-                pass
+            except (WebDriverException, AttributeError, RemoteDisconnected, ProtocolError):
+                print("Error in teardown method of %s" % method.__name__) #pass
             finally:
                 try:
                     geth = {geth_names[i]: geth_contents[i] for i in range(len(geth_names))}
@@ -418,6 +419,7 @@ class SauceSharedMultipleDeviceTestCase(AbstractTestCase):
                         continue
         if cls.loop:
             cls.loop.close()
+        print("Teardown of %s, TEST SUITE DATA:\n%s" % (cls.__name__, [i.name for i in test_suite_data.tests]))
         for test in test_suite_data.tests:
             cls.github_report.save_test(test)
 

test/appium/tests/conftest.py

@@ -288,6 +288,7 @@ def pytest_runtest_makereport(item, call):
         if error:
             test_suite_data.current_test.testruns[-1].error = final_error
             from support.github_report import GithubHtmlReport
+            print("Conftest, TEST SUITE DATA - %s:\n%s" % (item.instance.__class__.__name__, test_suite_data.tests))
             GithubHtmlReport().save_test(test_suite_data.current_test)
 
     if report.when == 'call':