Merge branch 'develop' into refresh-control-test

status-im · Apr 30, 2024 · d4646d7 · d4646d7
2 parents 71d54e3 + 8c26125
commit d4646d7
Show file tree

Hide file tree

Showing 89 changed files with 1,313 additions and 3,154 deletions.
diff --git a/.env b/.env
@@ -36,3 +36,4 @@ TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=0
+ENABLE_ALERT_BANNER=0
diff --git a/.env.e2e b/.env.e2e
@@ -37,3 +37,4 @@ TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=1
 DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000
 DELETE_MESSAGE_UNDO_TIME_LIMIT=10000
+ENABLE_ALERT_BANNER=0
diff --git a/.env.jenkins b/.env.jenkins
@@ -37,3 +37,4 @@ LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=1
+ENABLE_ALERT_BANNER=1
diff --git a/.env.nightly b/.env.nightly
@@ -23,3 +23,4 @@ DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
+ENABLE_ALERT_BANNER=1
diff --git a/ios/Podfile b/ios/Podfile
@@ -48,7 +48,7 @@ abstract_target 'Status' do
  use_react_native!(
  :path => config[:reactNativePath],
  :fabric_enabled => flags[:fabric_enabled],
- :hermes_enabled => false,
+ :hermes_enabled => true,
  # An absolute path to your application root.
  :app_path => "#{Pod::Config.instance.installation_root}/.."
  )