From 8e99442768c921b52ece26bf87f150a42285840d Mon Sep 17 00:00:00 2001
From: Siddarth Kumar <siddarthkay@gmail.com>
Date: Thu, 25 May 2023 00:28:58 +0530
Subject: [PATCH] Address feedback

---
 Makefile                                      |  7 ------
 .../java/im/status/ethereum/MainActivity.java | 22 -------------------
 ci/Jenkinsfile.ios                            |  4 +---
 ios/Podfile                                   | 20 ++++++++---------
 nix/deps/gradle/gradle_parser.awk             |  2 +-
 5 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/Makefile b/Makefile
index 091b08074372..3ce599af4f8f 100644
--- a/Makefile
+++ b/Makefile
@@ -231,13 +231,6 @@ jsbundle: export BUILD_ENV ?= prod
 jsbundle: ##@build Build JavaScript and Clojurescript bundle for iOS and Android
 	nix/scripts/build.sh targets.mobile.jsbundle
 
-release-ios-pr: export TARGET := ios
-release-ios-pr: export BUILD_ENV ?= prod
-release-ios-pr: watchman-clean ##@build Build release PR for iOS release
-	@git clean -dxf -f target/ios && \
-	$(MAKE) jsbundle-ios && \
-	xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusImPR -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive | xcpretty  --no-color
-
 #--------------
 # status-go lib
 #--------------
diff --git a/android/app/src/main/java/im/status/ethereum/MainActivity.java b/android/app/src/main/java/im/status/ethereum/MainActivity.java
index d219e7a7f9eb..87b24c14bab0 100644
--- a/android/app/src/main/java/im/status/ethereum/MainActivity.java
+++ b/android/app/src/main/java/im/status/ethereum/MainActivity.java
@@ -257,26 +257,4 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
             mPermissionListener = null;
         }
     }
-    /**
-       * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and
-       * you can specify the rendered you wish to use (Fabric or the older renderer).
-       */
-//     @Override
-//     protected ReactActivityDelegate createReactActivityDelegate() {
-//         return new MainActivityDelegate(this, getMainComponentName());
-//     }
-//
-//     public static class MainActivityDelegate extends ReactActivityDelegate {
-//         public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
-//             super(activity, mainComponentName);
-//         }
-//
-//         @Override
-//         protected ReactRootView createRootView() {
-//             ReactRootView reactRootView = new ReactRootView(getContext());
-//             // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-//             reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
-//             return reactRootView;
-//         }
-//     }
 }
diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios
index 89a96914ee7b..c561c8dd21f9 100644
--- a/ci/Jenkinsfile.ios
+++ b/ci/Jenkinsfile.ios
@@ -55,9 +55,7 @@ pipeline {
     }
     stage('JSBundle') {
       steps {
-        script {
-        ios.jsbundle()
-        }
+        script { ios.jsbundle() }
       }
     }
     stage('Bundle') {
diff --git a/ios/Podfile b/ios/Podfile
index 5d1e4b24116f..db25e6d9fac2 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -2,7 +2,6 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 platform :ios, '12.4'
-# install! 'cocoapods', :deterministic_uuids => false
 
 production = ENV["PRODUCTION"] == "1"
 
@@ -20,15 +19,16 @@ abstract_target 'Status' do
   # Flags change depending on the env values.
   flags = get_default_flags()
 
-  use_react_native!(:path => config[:reactNativePath],
-                    # to enable hermes on iOS, change `false` to `true` and then install pods
-                    :production => production,
-                    :hermes_enabled => flags[:hermes_enabled],
-                    :fabric_enabled => flags[:fabric_enabled],
-                    :use_codegen_discovery => true,
-                    # :flipper_configuration => FlipperConfiguration.enabled,
-                    # An absolute path to your application root.
-                    :app_path => "#{Pod::Config.instance.installation_root}/.."
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :production => production,
+    :hermes_enabled => flags[:hermes_enabled],
+    :fabric_enabled => flags[:fabric_enabled],
+    :use_codegen_discovery => true,
+    # :flipper_configuration => FlipperConfiguration.enabled,
+    # An absolute path to your application root.
+    :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
   pod 'react-native-image-resizer', :path => '../node_modules/react-native-image-resizer'
diff --git a/nix/deps/gradle/gradle_parser.awk b/nix/deps/gradle/gradle_parser.awk
index eff7efd248fd..5d8dcf1309b8 100644
--- a/nix/deps/gradle/gradle_parser.awk
+++ b/nix/deps/gradle/gradle_parser.awk
@@ -26,7 +26,7 @@ function findPackage(line, regex) {
     # Lines after configuration name list packages
     for (getline line; line != ""; getline line) {
         # React Native is provided by node_modules
-        if (line ~ "com.facebook.react:") { continue }
+        if (line ~ "com.facebook.react:(react-native|hermes-engine)") { continue }
 
         # Example: +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50
         if (findPackage(line, "--- ([^ :]+):([^ :]+):([^ :]+)$")) {