Merge branch 'develop' into reg-event-fx-update

upgrade react-native-permissions library to 4.1.5 (#19695 )
## Summary This commit upgrades `react-native-permissions` library to latest version 4.1.5 needed for : https://github.com/status-im/status-mobile/issues/18138 ## Review & Test notes Please test permissions related flows on onboarding, selecting images, notifications and any other areas you can think of. ## Platforms - iOS - Android status: ready
2024-04-22 23:23:07 +02:00 · 2024-04-22 18:01:45 +02:00 · 2024-04-22 17:33:30 +02:00 · 2024-04-22 18:04:46 +03:00 · 2024-04-22 20:29:29 +05:30 · 2024-04-22 19:48:01 +05:30
448 changed files with 4737 additions and 5556 deletions
@@ -35,4 +35,4 @@ LOCAL_PAIRING_ENABLED=1
 TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
-SHOW_NOT_IMPLEMENTED_FEATURES=1
+SHOW_NOT_IMPLEMENTED_FEATURES=0
@@ -8,7 +8,7 @@ The generally accepted requirements for its use are described below:
 - Once a PR is created, it moves to the ```REVIEW``` column where a review will be requested automatically.
 - You can also request a review inside the PR from a particular person if needed.
 - When creating a PR, do not forget to assign it to yourself.
- Also in case the PR adds new functionality, a short description would be appreciated.
+- Also in case the PR adds new functionality, a description **MUST** be added.

 ### What if the work is still in progress?

@@ -28,26 +28,11 @@ Ready for testing, a PR should meet the following criteria:
 4. Has the label: `request-manual-qa` or `skip-manual-qa`.
 5. PRs **MUST** identify what area is affected and should have a description.

-**NOTE:** Make sure that QAs are OK with that
-
-### Adding `skip-manual-qa`
-
- Please ask another team member before adding the `skip-manual-qa` label (PR/Status community/DMs) so that there's a second opinion.
- The PR MUST have a proper reasoning why manual QA is skipped.
- The PR MUST include the steps of testing that has been done by the developer prior to moving it forward.
-**From the perspective of a developer it means that once work on PR is finished:**
-
-1. It should be rebased to the latest `develop`. If there are conflicts - they should be resolved if possible.
-2. If the PR was in the `Contributor` column - it should be moved to `Review` column.
-3. Wait for the review.
-4. Make sure that after review and before requesting manual QA your PR is rebased to current develop.
-5. The PR **MUST** be moved to the E2E column when it is ready for testing (**mandatory for all PRs**).
-That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
-
-6. After that - PR will be taken into manual testing by the QA team.

 ### E2E tests and analyzing the results

+The PR **MUST** be moved to the E2E column when it is ready for testing (**mandatory for all PRs**).
+That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
 This step cannot be skipped. So, at least one comment from the `status-im-auto` bot with results is a prerequisite for moving forward.
 Information on how to analyze tests can be found [here](https://github.com/status-im/status-mobile/blob/develop/doc/how-to-launch-e2e.md).
 Tests might be flaky, as they depend on infrastructure - SauceLabs and Waku.
@@ -59,6 +44,20 @@ Please, respect this rule.**

 ## Testing PR

+### Adding `skip-manual-qa`
+
+**Do not hesitate to use a `skip-manual-qa`** if you're sure that it is a simple flow and you checked it. 
+- Please ask another team member before adding the `skip-manual-qa` label (PR/Status community/DMs) so that there's a second opinion.
+- The PR MUST have a proper reasoning why manual QA is skipped.
+- The PR MUST include the steps of testing that has been done by the developer prior to moving it forward.
+
+**NOTE:** Make sure that QAs are OK with that;
+
+Before merging PRs, please make sure that information is added about how you tested the PRs, that e2s have been passed and their results have been reviewed. 
+
+The QA team appreciates your help!
+
+
 ### Manual testing

 #### Prerequisites for manual testing
@@ -99,7 +98,7 @@ There are three possible scenarios when the design review is completed:
 ---
 **Notes:**
 - If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality.
+- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality (see `skip-manual-qa` label)
 ---        

 #### Why my PR is in `Contributor` column?
@@ -164,7 +164,7 @@ def build_ios_e2e
    # 3. directory where to up StatusIm.app
    derived_data_path: 'status-ios',
    output_name: 'StatusIm.app',
-    buildlog_path: 'ios/logs',
+    buildlog_path: 'logs',
    # -------------------------------------
    # Normal stuff
    scheme: 'StatusIm',
@@ -231,7 +231,7 @@ platform :ios do
      clean: true,
      export_method: 'app-store',
      output_directory: 'status-ios',
-      buildlog_path: 'ios/logs',
+      buildlog_path: 'logs',
      include_symbols: false,
      export_options: {
        "combileBitcode": true,
@@ -1,13 +1,28 @@
-# Resolve react_native_pods.rb with node to allow for hoisting
-require Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-    "react-native/scripts/react_native_pods.rb",
-    {paths: [process.argv[1]]},
-  )', __dir__]).strip
+def node_require(script)
+   # Resolve script with node to allow for hoisting
+   require Pod::Executable.execute_command('node', ['-p',
+     "require.resolve(
+       '#{script}',
+       {paths: [process.argv[1]]},
+     )", __dir__]).strip
+end
+
+node_require('react-native/scripts/react_native_pods.rb')
+node_require('react-native-permissions/scripts/setup.rb')

 platform :ios, min_ios_version_supported
 prepare_react_native_project!

+setup_permissions([
+  'Camera',
+  'FaceID',
+  'MediaLibrary',
+  'Microphone',
+  'Notifications',
+  'PhotoLibrary',
+  'PhotoLibraryAddOnly',
+])
+
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
  Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -43,9 +58,6 @@ abstract_target 'Status' do

  pod 'SSZipArchive', '2.4.3'

-  permissions_path = '../node_modules/react-native-permissions/ios'
-  pod 'Permission-Microphone', :path => "#{permissions_path}/Microphone/Permission-Microphone.podspec"
-  pod 'Permission-Camera', :path => "#{permissions_path}/Camera/Permission-Camera.podspec"
  pod "react-native-status-keycard", path: "../node_modules/react-native-status-keycard"
  pod "react-native-status", path: "../modules/react-native-status"
  pod "Keycard", git: "https://github.com/status-im/Keycard.swift.git"
@@ -28,10 +28,6 @@ PODS:
  - libwebp/mux (1.2.4):
    - libwebp/demux
  - libwebp/webp (1.2.4)
-  - Permission-Camera (3.8.0):
-    - RNPermissions
-  - Permission-Microphone (3.8.0):
-    - RNPermissions
  - RCT-Folly (2022.05.16.00):
    - boost
    - DoubleConversion
@@ -879,9 +875,13 @@ PODS:
    - React-Core
  - react-native-blob-util (0.13.18):
    - React-Core
-  - react-native-blur (4.3.3):
+  - react-native-blur (4.4.0):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
    - React-Core
-  - react-native-cameraroll (5.10.0):
+  - react-native-cameraroll (7.5.2):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
    - React-Core
  - react-native-config (1.5.0):
    - react-native-config/App (= 1.5.0)
@@ -1121,7 +1121,7 @@ PODS:
    - TOCropViewController
  - RNKeychain (8.1.2):
    - React-Core
-  - RNPermissions (3.8.0):
+  - RNPermissions (4.1.5):
    - React-Core
  - RNReanimated (3.6.1):
    - glog
@@ -1154,8 +1154,6 @@ DEPENDENCIES:
  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
  - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
  - Keycard (from `https://github.com/status-im/Keycard.swift.git`)
-  - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera/Permission-Camera.podspec`)
-  - Permission-Microphone (from `../node_modules/react-native-permissions/ios/Microphone/Permission-Microphone.podspec`)
  - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
  - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -1265,10 +1263,6 @@ EXTERNAL SOURCES:
    :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
  Keycard:
    :git: https://github.com/status-im/Keycard.swift.git
-  Permission-Camera:
-    :path: "../node_modules/react-native-permissions/ios/Camera/Permission-Camera.podspec"
-  Permission-Microphone:
-    :path: "../node_modules/react-native-permissions/ios/Microphone/Permission-Microphone.podspec"
  RCT-Folly:
    :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
  RCTRequired:
@@ -1448,8 +1442,6 @@ SPEC CHECKSUMS:
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
-  Permission-Camera: e6d142d7d8b714afe0a83e5e6ae17eb949f1e3e9
-  Permission-Microphone: 644b1de8bcc2afcaf934e09a22bee507a95796a7
  RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
  RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87
  RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c
@@ -1474,8 +1466,8 @@ SPEC CHECKSUMS:
  react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
  react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
  react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
-  react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
-  react-native-cameraroll: 4701ae7c3dbcd3f5e9e150ca17f250a276154b35
+  react-native-blur: 799045500f56146afc46245148080e7b7623cb75
+  react-native-cameraroll: af8eec1e585d053ff485d98ec837f9a8a11b5745
  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
  react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
  react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
@@ -1521,7 +1513,7 @@ SPEC CHECKSUMS:
  RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
  RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
  RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
-  RNPermissions: 215c54462104b3925b412b0fb3c9c497b21c358b
+  RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903
  RNReanimated: dee37576492f1a375017515f5c77e66e5eec696b
  RNShare: 859ff710211285676b0bcedd156c12437ea1d564
  RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
@@ -1534,6 +1526,6 @@ SPEC CHECKSUMS:
  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
  Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7

-PODFILE CHECKSUM: c9c6dfac28e31314e1a2ee2dc47364ad151f13f2
+PODFILE CHECKSUM: bb02c595a4aa4430da978b55da5440811cbd9d91

 COCOAPODS: 1.13.0
@@ -602,12 +602,14 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
@@ -624,12 +626,14 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
@@ -668,12 +672,14 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
@@ -60,10 +60,10 @@ in {
    version = "15.0";
    allowHigher = true;
  };
-  go = super.go_1_19;
+  go = super.go_1_20;
  clang = super.clang_15;
-  buildGoPackage = super.buildGo119Package;
-  buildGoModule = super.buildGo119Module;
+  buildGoPackage = super.buildGo120Package;
+  buildGoModule = super.buildGo120Module;
  gomobile = (super.gomobile.overrideAttrs (old: {
    patches = [
      (self.fetchurl { # https://github.com/golang/mobile/pull/84
@@ -9,10 +9,10 @@
  },
  "dependencies": {
    "@react-native-async-storage/async-storage": "1.19.3",
-    "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
+    "@react-native-camera-roll/camera-roll": "7.5.2",
    "@react-native-clipboard/clipboard": "1.13.2",
    "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
-    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status",
+    "@react-native-community/blur": "4.4.0",
    "@react-native-community/hooks": "^3.0.0",
    "@react-native-community/masked-view": "^0.1.6",
    "@react-native-community/netinfo": "^4.4.0",
@@ -48,10 +48,10 @@
    "react-native-keychain": "8.1.2",
    "react-native-linear-gradient": "^2.8.0",
    "react-native-lottie-splash-screen": "^1.0.1",
-    "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#refs/tags/v6.1.2-status",
+    "react-native-mail": "6.1.1",
    "react-native-navigation": "7.38.3",
    "react-native-orientation-locker": "^1.5.0",
-    "react-native-permissions": "3.8.0",
+    "react-native-permissions": "4.1.5",
    "react-native-reanimated": "3.6.1",
    "react-native-redash": "18.1.0",
    "react-native-shadow-2": "^7.0.8",
@@ -94,7 +94,6 @@
    "prettier": "^2.8.8",
    "process": "0.11.10",
    "react-test-renderer": "18.1.0",
-    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
    "shadow-cljs": "2.26.2"
  },
  "binary": {
@@ -0,0 +1,11 @@
+--- /tmp/tmp-status-mobile-851dbcb56/tmp.gcyqIAUEIA/build.gradle	2024-04-16 18:11:12.481819000 +0200
+++ ./node_modules/@react-native-community/blur/android/build.gradle	2024-04-16 18:11:18.889991702 +0200
+@@ -5,7 +5,7 @@
+   }
+ 
+   dependencies {
+-    classpath 'com.android.tools.build:gradle:3.5.3'
+    classpath 'com.android.tools.build:gradle:3.5.4'
+   }
+ }
+ 
@@ -0,0 +1,10 @@
+--- /tmp/tmp-status-mobile-61974dae4/tmp.6k5ZPUa0Hp/BlurView.ios.tsx	2024-04-16 17:07:33.229847000 +0200
+++ ./node_modules/@react-native-community/blur/src/components/BlurView.ios.tsx	2024-04-16 17:07:58.540617624 +0200
+@@ -6,6 +6,7 @@
+   | 'dark'
+   | 'light'
+   | 'xlight'
+  | 'transparent'
+   | 'prominent'
+   | 'regular'
+   | 'extraDark'
@@ -0,0 +1,57 @@
+--- /tmp/tmp-status-mobile-851dbcb56/tmp.beqWjtcNwi/BlurView.mm	2024-04-16 17:55:00.688450000 +0200
+++ ./node_modules/@react-native-community/blur/ios/BlurView.mm	2024-04-16 17:56:17.772952042 +0200
+@@ -73,7 +73,7 @@
+ {
+   const auto &oldViewProps = *std::static_pointer_cast<const BlurViewProps>(_props);
+   const auto &newViewProps = *std::static_pointer_cast<const BlurViewProps>(props);
+-  
+
+   if (oldViewProps.blurAmount != newViewProps.blurAmount) {
+     NSNumber *blurAmount = [NSNumber numberWithInt:newViewProps.blurAmount];
+     [self setBlurAmount:blurAmount];
+@@ -83,12 +83,12 @@
+     NSString *blurType = [NSString stringWithUTF8String:toString(newViewProps.blurType).c_str()];
+     [self setBlurType:blurType];
+   }
+-  
+
+   if (oldViewProps.reducedTransparencyFallbackColor != newViewProps.reducedTransparencyFallbackColor) {
+     UIColor *color = RCTUIColorFromSharedColor(newViewProps.reducedTransparencyFallbackColor);
+     [self setReducedTransparencyFallbackColor:color];
+   }
+-  
+
+   [super updateProps:props oldProps:oldProps];
+ }
+ #endif // RCT_NEW_ARCH_ENABLED
+@@ -131,6 +131,7 @@
+ 
+ - (UIBlurEffectStyle)blurEffectStyle
+ {
+  if ([self.blurType isEqual: @"transparent"]) return UIBlurEffectStyleDark;
+   if ([self.blurType isEqual: @"xlight"]) return UIBlurEffectStyleExtraLight;
+   if ([self.blurType isEqual: @"light"]) return UIBlurEffectStyleLight;
+   if ([self.blurType isEqual: @"dark"]) return UIBlurEffectStyleDark;
+@@ -160,7 +161,7 @@
+     if ([self.blurType isEqual: @"thinMaterialLight"]) return UIBlurEffectStyleSystemThinMaterialLight;
+     if ([self.blurType isEqual: @"ultraThinMaterialLight"]) return UIBlurEffectStyleSystemUltraThinMaterialLight;
+   #endif
+-    
+
+   #if TARGET_OS_TV
+     if ([self.blurType isEqual: @"regular"]) return UIBlurEffectStyleRegular;
+     if ([self.blurType isEqual: @"prominent"]) return UIBlurEffectStyleProminent;
+@@ -183,6 +184,13 @@
+   UIBlurEffectStyle style = [self blurEffectStyle];
+   self.blurEffect = [BlurEffectWithAmount effectWithStyle:style andBlurAmount:self.blurAmount];
+   self.blurEffectView.effect = self.blurEffect;
+
+  if ([self.blurType isEqual: @"transparent"]) {
+    for (UIView *subview in self.blurEffectView.subviews) {
+      subview.backgroundColor = [UIColor clearColor];
+    }
+  }
+
+ }
+ 
+ - (void)updateFallbackView
@@ -0,0 +1,10 @@
+--- /tmp/tmp-status-mobile-61974dae4/tmp.NHLSFZG6LG/BlurViewNativeComponent.ts	2024-04-16 17:08:42.755929000 +0200
+++ ./node_modules/@react-native-community/blur/src/fabric/BlurViewNativeComponent.ts	2024-04-16 17:08:57.634037113 +0200
+@@ -10,6 +10,7 @@
+     | 'dark'
+     | 'light'
+     | 'xlight'
+    | 'transparent'
+     | 'prominent'
+     | 'regular'
+     | 'extraDark'
@@ -0,0 +1,22 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.re8kHerusA/CameraRoll.ts	2024-04-16 15:17:12.942432000 +0200
+++ ./node_modules/@react-native-camera-roll/camera-roll/src/CameraRoll.ts	2024-04-16 15:17:42.455250986 +0200
+@@ -239,6 +239,19 @@
+   }
+ 
+   /**
+   * Returns total iOS image count
+   */
+  static getPhotosCountiOS(): Promise<number> {
+    return RNCCameraRoll.getPhotosCountiOS('');
+  }
+  /**
+   * Returns favorites and their count iOS
+   */
+  static getFavoritesiOS(): Promise<Album> {
+    return RNCCameraRoll.getFavoritesiOS('');
+  }
+
+  /**
+    * Saves the photo or video to the camera roll or photo library, and returns the URI of the newly created asset.
+    *
+    * @deprecated `save(...)` is deprecated - use `saveAsset(...)` instead.
@@ -0,0 +1,11 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.juxTO1BeCM/NativeCameraRollModule.ts	2024-04-16 15:21:28.379979000 +0200
+++ ./node_modules/@react-native-camera-roll/camera-roll/src/NativeCameraRollModule.ts	2024-04-16 15:21:40.490391291 +0200
+@@ -81,6 +81,8 @@
+   getPhotos(params: Object): Promise<PhotoIdentifiersPage>;
+   getAlbums(params: Object): Promise<Album[]>;
+   deletePhotos(photoUris: Array<string>): Promise<void>;
+  getPhotosCountiOS(arg: string): Promise<number>;
+  getFavoritesiOS(arg: string): Promise<Album>;
+   getPhotoByInternalID(
+     internalID: string,
+     options: Object,
@@ -0,0 +1,56 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.O0mkyjqnsy/RNCCameraRoll.mm	2024-04-16 15:26:23.070258000 +0200
+++ ./node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm	2024-04-16 15:26:32.664996066 +0200
+@@ -955,6 +955,53 @@
+     return [albumTitles copy];
+ }
+ 
+RCT_EXPORT_METHOD(getPhotosCountiOS:(NSString *)blank
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+{
+    __block NSInteger intTotalCount=0;
+    PHFetchOptions *allPhotosOptions = [PHFetchOptions new];
+    allPhotosOptions.predicate = [NSPredicate predicateWithFormat:@"mediaType == %d ",PHAssetMediaTypeImage];
+    PHFetchResult *allPhotosResult = [PHAsset fetchAssetsWithOptions:allPhotosOptions];
+    intTotalCount+=allPhotosResult.count;
+
+    resolve(@(intTotalCount));
+}
+
+RCT_EXPORT_METHOD(getFavoritesiOS:(NSString *)blank
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+{
+    __block NSInteger intTotalCount=0;
+    PHFetchOptions *fetchOptions = [PHFetchOptions new];
+    NSString *format = @"(favorite == true)";
+    fetchOptions.predicate = [NSPredicate predicateWithFormat:format];
+    PHFetchResult<PHAsset *> *const assetsFetchResult = [PHAsset fetchAssetsWithOptions:fetchOptions];
+    PHAsset *imageAsset = [assetsFetchResult firstObject];
+    NSMutableArray * result = [NSMutableArray new];
+
+    for (PHAsset* asset in assetsFetchResult) {
+        NSArray *resources = [PHAssetResource assetResourcesForAsset:asset ];
+        if ([resources count] < 1) continue;
+        NSString *orgFilename = ((PHAssetResource*)resources[0]).originalFilename;
+        NSString *uit = ((PHAssetResource*)resources[0]).uniformTypeIdentifier;
+        NSString *mimeType = (NSString *)CFBridgingRelease(UTTypeCopyPreferredTagWithClass((__bridge CFStringRef _Nonnull)(uit), kUTTagClassMIMEType));
+        CFStringRef extension = UTTypeCopyPreferredTagWithClass((__bridge CFStringRef _Nonnull)(uit), kUTTagClassFilenameExtension);
+        [result addObject:@{
+            @"width": @([asset pixelWidth]),
+            @"height": @([asset pixelHeight]),
+            @"filename": orgFilename ?: @"",
+            @"mimeType": mimeType ?: @"",
+            @"id": [asset localIdentifier],
+            @"creationDate": [asset creationDate],
+            @"uri": [NSString stringWithFormat:@"ph://%@", [asset localIdentifier]],
+            @"duration": @([asset duration])
+        }];
+    }
+    [result addObject:@{@"count": @(assetsFetchResult.count)}];
+    resolve(result);
+}
+
+ static void checkPhotoLibraryConfig()
+ {
+ #if RCT_DEV
@@ -0,0 +1,10 @@
+--- /tmp/tmp-status-mobile-61974dae4/tmp.zy6uXqO4gW/VibrancyViewNativeComponent.ts	2024-04-16 17:09:23.772623000 +0200
+++ ./node_modules/@react-native-community/blur/src/fabric/VibrancyViewNativeComponent.ts	2024-04-16 17:09:39.033737349 +0200
+@@ -10,6 +10,7 @@
+     | 'dark'
+     | 'light'
+     | 'xlight'
+    | 'transparent'
+     | 'prominent'
+     | 'regular'
+     | 'extraDark'
@@ -0,0 +1,15 @@
+--- /tmp/tmp-status-mobile-6e854428f/tmp.PSruc8WtHx/build.gradle	2024-04-17 11:08:46.857319000 +0200
+++ ./node_modules/react-native-mail/android/build.gradle	2024-04-17 11:09:22.935436792 +0200
+@@ -1,7 +1,11 @@
+ apply plugin: 'com.android.library'
+ 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+ android {
+-    compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : 23
+    compileSdkVersion safeExtGet('compileSdkVersion', 30)
+     buildToolsVersion project.hasProperty('buildToolsVersion') ? project.buildToolsVersion : "23.0.1"
+ 
+     defaultConfig {
@@ -1,9 +1,9 @@
 #!/usr/bin/env sh

-INVALID_CHANGES=$(grep -E -r '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im\.)' --include '*.cljs' --include '*.clj' './src/quo')
+INVALID_CHANGES=$(grep -E -r '(/atom|re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im\.)' --include '*.cljs' --include '*.clj' './src/quo')

 if test -n "$INVALID_CHANGES"; then
-    echo "WARNING: re-frame, status-im are not allowed in quo components"
+    echo "WARNING: re-frame, status-im, reagent atoms are not allowed in quo components"
    echo ''
    echo "$INVALID_CHANGES"
    exit 1
@@ -1,31 +0,0 @@
-(ns legacy.status-im.bottom-sheet.events
-  (:require
-    [utils.re-frame :as rf]))
-
-(rf/defn show-bottom-sheet-old
-  [{:keys [db]} {:keys [view options]}]
-  {:dismiss-keyboard              nil
-   :show-bottom-sheet-overlay-old nil
-   :db                            (assoc db
-                                         :bottom-sheet/show?   true
-                                         :bottom-sheet/view    view
-                                         :bottom-sheet/options options)})
-
-(rf/defn show-bottom-sheet-event
-  {:events [:bottom-sheet/show-sheet-old]}
-  [cofx view options]
-  (show-bottom-sheet-old
-   cofx
-   {:view    view
-    :options options}))
-
-(rf/defn hide-bottom-sheet-old
-  {:events [:bottom-sheet/hide-old]}
-  [{:keys [db]}]
-  {:db                               (assoc db :bottom-sheet/show? false)
-   :dismiss-bottom-sheet-overlay-old nil})
-
-(rf/defn hide-bottom-sheet-navigation-overlay
-  {:events [:bottom-sheet/hide-old-navigation-overlay]}
-  [{}]
-  {:dismiss-bottom-sheet-overlay-old nil})
@@ -1,38 +0,0 @@
-(ns legacy.status-im.bottom-sheet.sheets
-  (:require
-    [legacy.status-im.bottom-sheet.view :as bottom-sheet]
-    [legacy.status-im.ui.screens.about-app.views :as about-app]
-    [legacy.status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
-    [quo.theme :as theme]
-    [react-native.core :as rn]
-    [utils.re-frame :as rf]))
-
-(defn bottom-sheet
-  []
-  (let [dismiss-bottom-sheet-callback (fn []
-                                        (rf/dispatch [:bottom-sheet/hide-old])
-                                        true)
-        {:keys [show? view options]} (rf/sub [:bottom-sheet-old])
-        {:keys [content]
-         :as   opts}
-        (cond-> {:visible? show?}
-          (map? view)
-          (merge view)
-
-          (= view :mobile-network-offline)
-          (merge mobile-network-settings/offline-sheet)
-
-          (= view :learn-more)
-          (merge about-app/learn-more))
-        page-theme (:theme options)]
-
-    [:f>
-     (fn []
-       (rn/use-mount (fn []
-                       (rn/hw-back-add-listener dismiss-bottom-sheet-callback)
-                       (fn []
-                         (rn/hw-back-remove-listener dismiss-bottom-sheet-callback))))
-       [theme/provider {:theme (or page-theme (theme/get-theme))}
-        [bottom-sheet/bottom-sheet opts
-         (when content
-           [content (when options options)])]])]))
@@ -1,59 +0,0 @@
-(ns legacy.status-im.bottom-sheet.styles
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(def border-radius 20)
-
-(defn handle
-  [override-theme]
-  {:position         :absolute
-   :top              8
-   :width            32
-   :height           4
-   :background-color (colors/theme-colors colors/neutral-100 colors/white override-theme)
-   :opacity          0.1
-   :border-radius    100
-   :align-self       :center})
-
-(def backdrop
-  {:position :absolute
-   :left     0
-   :right    0
-   :bottom   0
-   :top      0})
-
-(def backdrop-color
-  {:background-color colors/neutral-100})
-
-(def container
-  {:position :absolute
-   :left     0
-   :right    0
-   :top      0
-   :bottom   0
-   :overflow :hidden})
-
-(defn content-style
-  [insets bottom-safe-area-spacing?]
-  {:position       :absolute
-   :left           0
-   :right          0
-   :top            0
-   :padding-top    border-radius
-   :padding-bottom (if bottom-safe-area-spacing? (:bottom insets) 0)})
-
-(defn selected-background
-  [override-theme]
-  {:border-radius     12
-   :padding-left      12
-   :margin-horizontal 8
-   :margin-bottom     10
-   :height            48
-   :background-color  (colors/theme-colors colors/white colors/neutral-90 override-theme)})
-
-(defn background
-  [override-theme]
-  {:background-color        (colors/theme-colors colors/white colors/neutral-95 override-theme)
-   :flex                    1
-   :border-top-left-radius  border-radius
-   :border-top-right-radius border-radius})
@@ -1,240 +0,0 @@
-(ns legacy.status-im.bottom-sheet.view
-  (:require
-    [legacy.status-im.bottom-sheet.styles :as styles]
-    [oops.core :refer [oget]]
-    [re-frame.core :as re-frame]
-    [react-native.background-timer :as timer]
-    [react-native.core :as react]
-    [react-native.core :as rn]
-    [react-native.gesture :as gesture]
-    [react-native.hooks :as hooks]
-    [react-native.platform :as platform]
-    [react-native.reanimated :as reanimated]
-    [react-native.safe-area :as safe-area]
-    [reagent.core :as reagent]
-    [utils.worklets.bottom-sheet :as worklets.bottom-sheet]))
-
-(def animation-delay 450)
-
-(defn with-animation
-  [value]
-  (reanimated/with-spring
-   value
-   (clj->js {:mass      2
-             :stiffness 500
-             :damping   200})))
-
-(defn get-bottom-sheet-gesture
-  [pan-y translate-y bg-height bg-height-expanded
-   window-height keyboard-shown disable-drag? expandable?
-   show-bottom-sheet? expanded? close-bottom-sheet gesture-running?]
-  (-> (gesture/gesture-pan)
-      (gesture/on-start
-       (fn [_]
-         (reset! gesture-running? true)
-         (when (and keyboard-shown (not disable-drag?) show-bottom-sheet?)
-           (re-frame/dispatch [:dismiss-keyboard]))))
-      (gesture/on-update
-       (fn [evt]
-         (when (and (not disable-drag?) show-bottom-sheet?)
-           (let [max-pan-up   (if (or @expanded? (not expandable?))
-                                0
-                                (- (- bg-height-expanded bg-height)))
-                 max-pan-down (if @expanded?
-                                bg-height-expanded
-                                bg-height)]
-             (reanimated/set-shared-value pan-y
-                                          (max
-                                           (min
-                                            (.-translationY evt)
-                                            max-pan-down)
-                                           max-pan-up))))))
-      (gesture/on-end
-       (fn [_]
-         (reset! gesture-running? false)
-         (when (and (not disable-drag?) show-bottom-sheet?)
-           (let [end-pan-y                  (- window-height (.-value translate-y))
-                 expand-threshold           (min (* bg-height 1.1) (+ bg-height 50))
-                 collapse-threshold         (max (* bg-height-expanded 0.9) (- bg-height-expanded 50))
-                 should-close-bottom-sheet? (< end-pan-y (max (* bg-height 0.7) 50))]
-             (cond
-               should-close-bottom-sheet?
-               (close-bottom-sheet)
-
-               (and (not @expanded?) (> end-pan-y expand-threshold))
-               (reset! expanded? true)
-
-               (and @expanded? (< end-pan-y collapse-threshold))
-               (reset! expanded? false))))))))
-
-(defn handle-view
-  [window-width override-theme]
-  [rn/view
-   {:style {:width            window-width
-            :position         :absolute
-            :background-color :transparent
-            :top              0
-            :height           20}}
-   [rn/view {:style (styles/handle override-theme)}]])
-
-(defn bottom-sheet
-  [props children]
-  (let [{on-cancel                 :on-cancel
-         disable-drag?             :disable-drag?
-         show-handle?              :show-handle?
-         visible?                  :visible?
-         backdrop-dismiss?         :backdrop-dismiss?
-         expandable?               :expandable?
-         bottom-safe-area-spacing? :bottom-safe-area-spacing?
-         selected-item             :selected-item
-         is-initially-expanded?    :expanded?
-         override-theme            :override-theme
-         :or                       {show-handle?              true
-                                    backdrop-dismiss?         true
-                                    expandable?               false
-                                    bottom-safe-area-spacing? true
-                                    is-initially-expanded?    false}}
-        props
-        content-height (reagent/atom nil)
-        show-bottom-sheet? (reagent/atom nil)
-        keyboard-was-shown? (reagent/atom false)
-        expanded? (reagent/atom is-initially-expanded?)
-        gesture-running? (reagent/atom false)
-        reset-atoms (fn []
-                      (reset! show-bottom-sheet? nil)
-                      (reset! content-height nil)
-                      (reset! expanded? false)
-                      (reset! keyboard-was-shown? false)
-                      (reset! gesture-running? false))
-        close-bottom-sheet (fn []
-                             (reset! show-bottom-sheet? false)
-                             (when (fn? on-cancel) (on-cancel))
-                             (timer/set-timeout
-                              #(do
-                                 (re-frame/dispatch [:bottom-sheet/hide-old-navigation-overlay])
-                                 (reset-atoms))
-                              animation-delay))]
-    [:f>
-     (fn []
-       (let [{height       :height
-              window-width :width}
-             (rn/get-window)
-             window-height (if selected-item (- height 72) height)
-             {:keys [keyboard-shown]} (hooks/use-keyboard)
-             insets (safe-area/get-insets)
-             bg-height-expanded (- window-height (:top insets))
-             bg-height (max (min @content-height bg-height-expanded) 109)
-             bottom-sheet-dy (reanimated/use-shared-value 0)
-             pan-y (reanimated/use-shared-value 0)
-             translate-y (worklets.bottom-sheet/use-translate-y window-height bottom-sheet-dy pan-y)
-             bg-opacity
-             (worklets.bottom-sheet/use-background-opacity translate-y bg-height window-height 0.7)
-             on-content-layout (fn [evt]
-                                 (let [height (oget evt "nativeEvent" "layout" "height")]
-                                   (reset! content-height height)))
-             on-expanded (fn []
-                           (reanimated/set-shared-value bottom-sheet-dy bg-height-expanded)
-                           (reanimated/set-shared-value pan-y 0))
-             on-collapsed (fn []
-                            (reanimated/set-shared-value bottom-sheet-dy bg-height)
-                            (reanimated/set-shared-value pan-y 0))
-             bottom-sheet-gesture (get-bottom-sheet-gesture
-                                   pan-y
-                                   translate-y
-                                   bg-height
-                                   bg-height-expanded
-                                   window-height
-                                   keyboard-shown
-                                   disable-drag?
-                                   expandable?
-                                   show-bottom-sheet?
-                                   expanded?
-                                   close-bottom-sheet
-                                   gesture-running?)
-             handle-comp [gesture/gesture-detector {:gesture bottom-sheet-gesture}
-                          [handle-view window-width override-theme]]]
-
-         (react/use-effect #(do
-                              (cond
-                                (and
-                                 (nil? @show-bottom-sheet?)
-                                 visible?
-                                 (some? @content-height)
-                                 (> @content-height 0))
-                                (reset! show-bottom-sheet? true)
-
-                                (and @show-bottom-sheet? (not visible?))
-                                (close-bottom-sheet)))
-                           [@show-bottom-sheet? @content-height visible?])
-         (react/use-effect #(do
-                              (when @show-bottom-sheet?
-                                (cond
-                                  keyboard-shown
-                                  (do
-                                    (reset! keyboard-was-shown? true)
-                                    (reset! expanded? true))
-                                  (and @keyboard-was-shown? (not keyboard-shown))
-                                  (reset! expanded? false))))
-                           [@show-bottom-sheet? @keyboard-was-shown? keyboard-shown])
-         (react/use-effect #(do
-                              (when-not @gesture-running?
-                                (cond
-                                  @show-bottom-sheet?
-                                  (if @expanded?
-                                    (do
-                                      (reanimated/set-shared-value
-                                       bottom-sheet-dy
-                                       (with-animation (+ bg-height-expanded (.-value pan-y))))
-                                      ;; Workaround for
-                                      ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741
-                                      ;; withTiming/withSpring callback not working on-expanded
-                                      ;; should be called as a callback of with-animation instead,
-                                      ;; once this issue has been resolved
-                                      (timer/set-timeout on-expanded animation-delay))
-                                    (do
-                                      (reanimated/set-shared-value
-                                       bottom-sheet-dy
-                                       (with-animation (+ bg-height (.-value pan-y))))
-                                      ;; Workaround for
-                                      ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741
-                                      ;; withTiming/withSpring callback not working on-collapsed
-                                      ;; should be called as a callback of with-animation instead,
-                                      ;; once this issue has been resolved
-                                      (timer/set-timeout on-collapsed animation-delay)))
-
-                                  (= @show-bottom-sheet? false)
-                                  (reanimated/set-shared-value bottom-sheet-dy (with-animation 0)))))
-                           [@show-bottom-sheet? @expanded? @gesture-running?])
-
-         [:<>
-          [rn/pressable
-           {:on-press (when backdrop-dismiss? close-bottom-sheet)
-            :style    styles/backdrop}
-           [reanimated/view
-            {:style (reanimated/apply-animations-to-style
-                     {:opacity bg-opacity}
-                     styles/backdrop-color)}]]
-          (cond->> [reanimated/view
-                    {:style (reanimated/apply-animations-to-style
-                             {:transform [{:translateY translate-y}]}
-                             {:width  window-width
-                              :height window-height})}
-                    [rn/view {:style styles/container}
-                     (when selected-item
-                       [rn/view {:style (styles/selected-background override-theme)}
-                        [selected-item]])
-                     [rn/view {:style (styles/background override-theme)}
-                      [rn/keyboard-avoiding-view
-                       {:behaviour (if platform/ios? :padding :height)
-                        :style     {:flex 1}}
-                       [rn/view
-                        {:style     (styles/content-style insets bottom-safe-area-spacing?)
-                         :on-layout (when-not (and
-                                               (some? @content-height)
-                                               (> @content-height 0))
-                                      on-content-layout)}
-                        children]]
-                      (when show-handle?
-                        handle-comp)]]]
-            (not show-handle?)
-            (conj [gesture/gesture-detector {:gesture bottom-sheet-gesture}]))]))]))
@@ -2,7 +2,6 @@
  (:require
    ["eth-phishing-detect" :as eth-phishing-detect]
    [clojure.string :as string]
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
    [legacy.status-im.browser.permissions :as browser.permissions]
    [legacy.status-im.browser.webview-ref :as webview-ref]
    [legacy.status-im.ethereum.ens :as ens]
@@ -519,7 +518,7 @@
  [{:keys [db] :as cofx} address]
  (rf/merge cofx
            {:browser/clear-web-data nil}
-            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/hide-bottom-sheet)
            (browser.permissions/clear-dapps-permissions)
            (multiaccounts.update/multiaccount-update :dapps-address address {})
            #(when (= (:view-id db) :browser)
@@ -1,7 +1,6 @@
 (ns legacy.status-im.communities.core
  (:require
    [clojure.set :as set]
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
    legacy.status-im.communities.e2e
    [re-frame.core :as re-frame]
    [status-im.contexts.shell.activity-center.events :as activity-center]
@@ -34,18 +33,11 @@
            (navigation/navigate-back)
            (handle-response response-js)))

-(re-frame/reg-event-fx ::member-banned
- (fn [{:keys [db]} [response-js]]
-   {:db (assoc db :bottom-sheet/show? false)
-    :fx [[:dismiss-bottom-sheet-overlay-old]
-         [:sanitize-messages-and-process-response response-js]
-         [:activity-center.notifications/fetch-unread-count]]}))
-
 (rf/defn member-banned
  {:events [::member-banned]}
  [cofx response-js]
  (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/hide-bottom-sheet)
            (handle-response response-js)
            (activity-center/notifications-fetch-unread-count)))

@@ -66,7 +58,7 @@
  {:events [::member-kicked]}
  [cofx response-js]
  (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/hide-bottom-sheet)
            (handle-response response-js)))

 (rf/defn member-kick
@@ -100,7 +92,7 @@
  {:events [:community.member/role-updated]}
  [cofx response-js]
  (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/hide-bottom-sheet)
            (handle-response response-js)))

 (rf/defn add-role-to-member
@@ -3,7 +3,6 @@
  (:require
    [clojure.set :as set]
    [clojure.string :as string]
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
    [legacy.status-im.ethereum.ens :as ens]
    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
    [legacy.status-im.utils.random :as random]
@@ -288,7 +287,7 @@
  [{:keys [db] :as cofx} _ {:keys [address]}]
  (rf/merge cofx
            {:db (assoc-in db [:ens/registration :address] address)}
-            (bottom-sheet/hide-bottom-sheet-old)))
+            (navigation/hide-bottom-sheet)))

 (rf/defn save-preferred-name
  {:events [::save-preferred-name]}
@@ -189,8 +189,8 @@
               :db                        (assoc db :screens/was-focused-once? true)}

              (not (get db :screens/was-focused-once?))
-              {:db (assoc db :screens/was-focused-once? true)})
-  ))
+              {:db (assoc db :screens/was-focused-once? true)})))
+

 ;;TODO :replace by named events
 (rf/defn set-event
@@ -1,6 +1,5 @@
 (ns legacy.status-im.mobile-sync-settings.core
  (:require
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
    [legacy.status-im.mailserver.core :as mailserver]
    [legacy.status-im.multiaccounts.model :as multiaccounts.model]
    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
@@ -31,7 +30,7 @@
              (assoc :mailserver/current-request true))
        :fx [(when fetch-historic-messages?
               [:mailserver/request-all-historic-messages])
-             [:dismiss-bottom-sheet-overlay-old]
+             [:dispatch [:hide-bottom-sheet]]
             (when previously-initialized?
               (let [new-identity-input (get-in db [:contacts/new-identity :input])]
                 [:dispatch [:contacts/set-new-identity {:input new-identity-input}]]))]}
@@ -101,10 +100,10 @@
  [cofx]
  (rf/merge
   cofx
-   (bottom-sheet/hide-bottom-sheet-old)
+   (navigation/hide-bottom-sheet)
   (navigation/navigate-to :mobile-network-settings nil)))

 (rf/defn mobile-network-show-offline-sheet
  {:events [:mobile-network/show-offline-sheet]}
  [cofx]
-  (bottom-sheet/hide-bottom-sheet-old cofx))
+  (navigation/hide-bottom-sheet cofx))
@@ -8,7 +8,7 @@
    [legacy.status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils]
    [quo.components.avatars.user-avatar.style :as user-avatar.style]
    [quo.core :as quo]
-    [quo.theme :as theme]
+    [quo.theme]
    [re-frame.core :as re-frame.core]
    [react-native.core :as rn]
    [status-im.contexts.profile.utils :as profile.utils]
@@ -52,7 +52,8 @@

 (defn profile-photo-plus-dot-view
  [{:keys [public-key full-name customization-color photo-container photo-path community?]}]
-  (let [photo-container         (if (nil? photo-container)
+  (let [theme                   @(re-frame.core/subscribe [:theme])
+        photo-container         (if (nil? photo-container)
                                  styles/container-chat-list
                                  photo-container)
        size                    (:width photo-container)
@@ -71,8 +72,7 @@
               {:size             size
                :full-name        full-name
                :font-size        (get text-style :font-size)
-                :background-color (user-avatar.style/customization-color customization-color
-                                                                         (theme/get-theme))
+                :background-color (user-avatar.style/customization-color customization-color theme)
                :indicator-size   0
                :indicator-border 0
                :indicator-color  "#000000"
@@ -2,6 +2,7 @@
  (:require
    [legacy.status-im.ui.components.core :as quo]
    [quo.foundations.colors :as quo.colors]
+    [quo.theme]
    [re-frame.core :as re-frame]
    [react-native.safe-area :as safe-area]))

@@ -32,7 +33,8 @@
    :or   {border-bottom? true
           new-ui?        false}
    :as   props}]
-  (let [navigation (if (= navigation :none)
+  (let [theme      (quo.theme/use-theme)
+        navigation (if (= navigation :none)
                     nil
                     [(default-navigation modal? navigation)])]
    [quo/header
@@ -47,4 +49,5 @@
              {:right-accessories right-accessories})
            (when new-ui?
              {:background (quo.colors/theme-colors quo.colors/neutral-5
-                                                    quo.colors/neutral-95)}))]))
+                                                    quo.colors/neutral-95
+                                                    theme)}))]))
@@ -31,7 +31,7 @@
        :on-press            #(re-frame/dispatch [:browser.ui/open-url url])
        :on-long-press       (fn []
                               (re-frame/dispatch
-                                [:bottom-sheet/show-sheet-old
+                                [:show-bottom-sheet
                                 {:content (fn []
                                             [react/view {:flex 1}
                                              [list.item/list-item
@@ -110,7 +110,7 @@
     [quo/button
      {:accessibility-label :select-account
       :type                :scale
-       :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+       :on-press            #(re-frame/dispatch [:show-bottom-sheet
                                                 {:content (accounts/accounts-list accounts
                                                                                   dapps-account)}])}
      [react/view (styles/dapps-account color)
@@ -91,7 +91,7 @@
      [icons/icon :main-icons/arrow-right {:color colors/black}]]
     [react/touchable-highlight
      {:accessibility-label :select-account
-       :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+       :on-press            #(re-frame/dispatch [:show-bottom-sheet
                                                 {:content (accounts/accounts-list accounts
                                                                                   dapps-account)}])}
      [chat-icon/custom-icon-view-list (:name dapps-account) (:color dapps-account) 32]]
@@ -108,7 +108,7 @@
        [icons/icon :main-icons/qr {:color colors/black}]]
       [react/touchable-highlight
        {:on-press            #(re-frame/dispatch
-                                [:bottom-sheet/show-sheet-old
+                                [:show-bottom-sheet
                                 {:content (options/browser-options
                                            url
                                            dapps-account
@@ -162,7 +162,7 @@
 (defn request-resources-access-for-page
  [resources url webview-ref]
  (re-frame/dispatch
-   [:bottom-sheet/show-sheet-old
+   [:show-bottom-sheet
    {:content            (fn [] [request-resources-panel resources url webview-ref])
     :show-handle?       false
     :backdrop-dismiss?  false
@@ -172,7 +172,7 @@
 (defn block-resources-access-and-notify-user
  [url]
  (.answerPermissionRequest ^js @webview-ref/webview-ref false)
-  (re-frame/dispatch [:bottom-sheet/show-sheet-old
+  (re-frame/dispatch [:show-bottom-sheet
                      {:content (fn [] [block-resources-panel url])}]))

 ;; should-component-update is called only when component's props are changed,
@@ -46,22 +46,22 @@
   :color      colors/gray})

 (defn message-default-style
-  []
+  [theme]
  {:font-family    "Inter-Regular"
-   :color          (quo.colors/theme-colors quo.colors/neutral-100 quo.colors/white)
+   :color          (quo.colors/theme-colors quo.colors/neutral-100 quo.colors/white theme)
   :font-size      15
   :line-height    21.75
   :letter-spacing -0.135})

 ;; Markdown styles
 (defn default-text-style
-  []
+  [theme]
  {:max-font-size-multiplier react/max-font-size-multiplier
-   :style                    (message-default-style)})
+   :style                    (message-default-style theme)})

 (defn system-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
          :style       assoc
          :color       colors/gray
          :line-height 20
@@ -70,65 +70,65 @@
          :font-weight "400"))

 (defn text-style
-  [content-type in-popover?]
+  [content-type in-popover? theme]
  (merge
   (when in-popover? {:number-of-lines 2})
   (cond
-     (= content-type constants/content-type-system-text)           (system-text-style)
-     (= content-type constants/content-type-system-pinned-message) (system-text-style)
-     :else                                                         (default-text-style))))
+     (= content-type constants/content-type-system-text)           (system-text-style theme)
+     (= content-type constants/content-type-system-pinned-message) (system-text-style theme)
+     :else                                                         (default-text-style theme))))

 (defn emph-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
          :style
          assoc
          :font-style :italic))

 (defn emph-style
-  []
-  (emph-text-style))
+  [theme]
+  (emph-text-style theme))

 (defn strong-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
          :style
          assoc
          :font-weight "700"))

 (defn outgoing-strong-text-style
-  []
-  (update (strong-text-style)
+  [theme]
+  (update (strong-text-style theme)
          :style
          assoc
          :color colors/white-persist))

 (defn strong-style
-  []
-  (outgoing-strong-text-style)
-  (strong-text-style))
+  [theme]
+  (outgoing-strong-text-style theme)
+  (strong-text-style theme))

 (defn strong-emph-style
-  []
-  (update (strong-style)
+  [theme]
+  (update (strong-style theme)
          :style
          assoc
          :font-style :italic))

 (defn strikethrough-style
-  []
-  (cond-> (update (default-text-style)
+  [theme]
+  (cond-> (update (default-text-style theme)
                  :style
                  assoc
                  :text-decoration-line :line-through)))

 (defn edited-style
-  []
+  [theme]
  (cond->
-    (update (default-text-style)
+    (update (default-text-style theme)
            :style
            assoc
-            :color (quo.colors/theme-colors quo.colors/neutral-40 quo.colors/neutral-50)
+            :color (quo.colors/theme-colors quo.colors/neutral-40 quo.colors/neutral-50 theme)
            :font-size 13
            :line-height 18.2
            :letter-spacing (typography/tracking 13))))
@@ -149,8 +149,8 @@
  (default-blockquote-style))

 (defn default-blockquote-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
          :style
          assoc
          :line-height 19
@@ -158,16 +158,16 @@
          :color colors/black-transparent-50))

 (defn outgoing-blockquote-text-style
-  []
-  (update (default-blockquote-text-style)
+  [theme]
+  (update (default-blockquote-text-style theme)
          :style
          assoc
          :color colors/white-transparent-70-persist))

 (defn blockquote-text-style
-  []
-  (outgoing-blockquote-text-style)
-  (default-blockquote-text-style))
+  [theme]
+  (outgoing-blockquote-text-style theme)
+  (default-blockquote-text-style theme))

 (defn community-verified
  []
@@ -6,6 +6,7 @@
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
    [quo.foundations.typography :as typography]
+    [quo.theme]
    [react-native.core :as rn]
    [status-im.constants :as constants]
    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events]
@@ -26,7 +27,7 @@

 (defn render-inline
  [_message-text content-type acc {:keys [type literal destination]}
-   community-id]
+   community-id theme]
  (case type
    ""
    (conj acc literal)
@@ -35,24 +36,25 @@
    (conj acc [rn/text literal])

    "emph"
-    (conj acc [rn/text (style/emph-style) literal])
+    (conj acc [rn/text (style/emph-style theme) literal])

    "strong"
-    (conj acc [rn/text (style/strong-style) literal])
+    (conj acc [rn/text (style/strong-style theme) literal])

    "strong-emph"
-    (conj acc [quo/text (style/strong-emph-style) literal])
+    (conj acc [quo/text (style/strong-emph-style theme) literal])

    "del"
-    (conj acc [rn/text (style/strikethrough-style) literal])
+    (conj acc [rn/text (style/strikethrough-style theme) literal])

    "link"
-    (conj acc
-          [rn/text
-           {:style    {:color                (colors/theme-colors colors/primary-50 colors/primary-60)
-                       :text-decoration-line :underline}
-            :on-press #(rf/dispatch [:browser.ui/message-link-pressed destination])}
-           destination])
+    (conj
+     acc
+     [rn/text
+      {:style    {:color                (colors/theme-colors colors/primary-50 colors/primary-60 theme)
+                  :text-decoration-line :underline}
+       :on-press #(rf/dispatch [:browser.ui/message-link-pressed destination])}
+      destination])

    "mention"
    (conj
@@ -66,17 +68,18 @@
                    #(rf/dispatch [:chat.ui/show-profile literal]))}
       [mention-element literal]]])
    "status-tag"
-    (conj acc
-          [rn/text
-           (when community-id
-             {:style    {:color                (colors/theme-colors colors/primary-50 colors/primary-60)
-                         :text-decoration-line :underline}
-              :on-press #(rf/dispatch [:communities/status-tag-pressed community-id literal])})
-           "#"
-           literal])
+    (conj
+     acc
+     [rn/text
+      (when community-id
+        {:style    {:color                (colors/theme-colors colors/primary-50 colors/primary-60 theme)
+                    :text-decoration-line :underline}
+         :on-press #(rf/dispatch [:communities/status-tag-pressed community-id literal])})
+      "#"
+      literal])

    "edited"
-    (conj acc [rn/text (style/edited-style) (str " (" (i18n/label :t/edited) ")")])
+    (conj acc [rn/text (style/edited-style theme) (str " (" (i18n/label :t/edited) ")")])

    (conj acc literal)))

@@ -84,7 +87,7 @@
 (defn render-block
  [{:keys [content content-type edited-at in-popover?]} acc
   {:keys [type ^js literal children]}
-   community-id]
+   community-id theme]

  (case type

@@ -96,8 +99,9 @@
                            content-type
                            acc
                            e
-                            community-id))
-           [rn/text (style/text-style content-type in-popover?)]
+                            community-id
+                            theme))
+           [rn/text (style/text-style content-type in-popover? theme)]
           (conj
            children
            (when edited-at
@@ -106,7 +110,7 @@
    "blockquote"
    (conj acc
          [rn/view (style/blockquote-style)
-           [rn/text (style/blockquote-text-style)
+           [rn/text (style/blockquote-text-style theme)
            (.substring literal 0 (.-length literal))]])

    "codeblock"
@@ -119,12 +123,14 @@
 (defn render-parsed-text
  [{:keys [content chat-id]
    :as   message-data}]
-  (let [community-id (rf/sub [:community-id-by-chat-id chat-id])]
+  (let [community-id (rf/sub [:community-id-by-chat-id chat-id])
+        theme        (quo.theme/use-theme)]
    (reduce (fn [acc e]
              (render-block message-data
                            acc
                            e
-                            community-id))
+                            community-id
+                            theme))
            [:<>]
            (:parsed-text content))))

@@ -137,12 +143,13 @@
 ;; STATUS ? whats that ?
 (defmethod ->message constants/content-type-status
  [{:keys [content content-type]}]
-  [rn/view style/status-container
-   [rn/text {:style (style/status-text)}
-    (reduce
-     (fn [acc e] (render-inline (:text content) content-type acc e nil))
-     [rn/text {:style (style/status-text)}]
-     (-> content :parsed-text peek :children))]])
+  (let [theme (quo.theme/use-theme)]
+    [rn/view style/status-container
+     [rn/text {:style (style/status-text)}
+      (reduce
+       (fn [acc e] (render-inline (:text content) content-type acc e nil theme))
+       [rn/text {:style (style/status-text)}]
+       (-> content :parsed-text peek :children))]]))

 (defn contact-request-status-pending
  []
@@ -73,7 +73,7 @@
      :accessory           (when (not= public-key my-public-key)
                             [quo/button
                              {:on-press
-                               #(rf/dispatch [:bottom-sheet/show-sheet-old
+                               #(rf/dispatch [:show-bottom-sheet
                                              {:content (fn []
                                                          [member-sheet primary-name member community-id
                                                           can-kick-users? can-manage-users? admin?])}])
@@ -757,7 +757,7 @@
        [profile.components/settings-item
         {:label-kw  :ens-primary-username
          :value     preferred-name
-          :action-fn #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+          :action-fn #(re-frame/dispatch [:show-bottom-sheet
                                          {:content
                                           (fn [] (name-list names preferred-name))}])}]])]]])

@@ -11,7 +11,7 @@
    [legacy.status-im.ui.components.topbar :as topbar]
    [legacy.status-im.ui.screens.profile.components.sheets :as sheets]
    [quo.components.avatars.user-avatar.style :as user-avatar.style]
-    [quo.theme :as theme]
+    [quo.theme]
    [re-frame.core :as re-frame]
    [reagent.core :as reagent]
    [status-im.constants :as constants]
@@ -184,6 +184,7 @@
         :as   profile}     @(re-frame/subscribe [:contacts/current-contact])
        muted?              @(re-frame/subscribe [:chats/muted public-key])
        customization-color (or customization-color :primary)
+        theme               @(re-frame/subscribe [:theme])
        on-share            #(re-frame/dispatch [:show-popover
                                                 (merge
                                                  {:view    :share-chat-key
@@ -205,8 +206,7 @@
          {:on-press         on-share
           :bottom-separator false
           :title            (profile.utils/displayed-name profile)
-           :color            (user-avatar.style/customization-color customization-color
-                                                                    (theme/get-theme))
+           :color            (user-avatar.style/customization-color customization-color theme)
           :photo            (profile.utils/photo profile)
           :monospace        (not ens-verified)
           :subtitle         secondary-name
@@ -74,7 +74,7 @@
                 (not= public-key current-user-identity))
        {:accessory [quo/button
                     {:on-press            #(re-frame/dispatch
-                                             [:bottom-sheet/show-sheet-old
+                                             [:bottom-sheet/show-sheet
                                              {:content (fn []
                                                          [member-sheet chat-id member admin?])}])
                      :type                :icon
@@ -146,7 +146,7 @@
    [list.item/list-item
     {:title    (profile.utils/displayed-name contact)
      :icon     [chat-icon/contact-icon-contacts-tab contact]
-      :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+      :on-press #(re-frame/dispatch [:show-bottom-sheet
                                     {:content (fn []
                                                 [invitation-sheet invitation contact])}])}]))

@@ -14,7 +14,7 @@
    [legacy.status-im.ui.screens.profile.visibility-status.views :as visibility-status]
    [legacy.status-im.utils.utils :as utils]
    [quo.components.avatars.user-avatar.style :as user-avatar.style]
-    [quo.theme :as theme]
+    [quo.theme]
    [re-frame.core :as re-frame]
    [reagent.core :as reagent]
    [status-im.common.qr-codes.view :as qr-codes]
@@ -200,6 +200,7 @@
          @(re-frame/subscribe [:profile/profile-with-image])
          customization-color (or (:color @(re-frame/subscribe [:onboarding/profile]))
                                  @(re-frame/subscribe [:profile/customization-color key-uid]))
+          theme @(re-frame/subscribe [:theme])
          on-share #(re-frame/dispatch [:show-popover
                                        {:view     :share-chat-key
                                         :address  (or compressed-key
@@ -217,11 +218,11 @@
         :use-insets        true
         :extended-header   (profile-header/extended-header
                             {:on-press  on-share
-                              :on-edit   #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+                              :on-edit   #(re-frame/dispatch [:show-bottom-sheet
                                                              {:content (edit/bottom-sheet
                                                                         has-picture)}])
                              :color     (user-avatar.style/customization-color customization-color
-                                                                                (theme/get-theme))
+                                                                                theme)
                              :title     (profile.utils/displayed-name profile)
                              :photo     (profile.utils/photo profile)
                              :monospace (not ens-verified)
@@ -17,14 +17,14 @@
   :padding-right          12})

 (defn visibility-status-dot
-  [{:keys [color size new-ui?]}]
+  [{:keys [color size new-ui?]} theme]
  (if new-ui?
    {:background-color color
     :width            size
     :height           size
     :border-radius    (/ size 2)
     :border-width     3.5
-     :border-color     (quo.colors/theme-colors quo.colors/white quo.colors/neutral-90)}
+     :border-color     (quo.colors/theme-colors quo.colors/white quo.colors/neutral-90 theme)}
    {:background-color color
     :width            size
     :height           size
@@ -33,10 +33,11 @@
     :border-color     colors/white}))

 (defn visibility-status-profile-dot
-  [{:keys [color size border-width margin-left new-ui?]}]
+  [{:keys [color size border-width margin-left new-ui?]} theme]
  (merge (visibility-status-dot {:color   color
                                 :size    size
-                                 :new-ui? new-ui?})
+                                 :new-ui? new-ui?}
+                                theme)
         {:margin-right 6
          :margin-left  margin-left
          :border-width border-width}))
@@ -3,6 +3,7 @@
    [legacy.status-im.ui.components.colors :as colors]
    [legacy.status-im.ui.screens.profile.visibility-status.styles :as styles]
    [quo.foundations.colors :as quo.colors]
+    [quo.theme]
    [status-im.constants :as constants]
    [utils.datetime :as datetime]
    [utils.i18n :as i18n]
@@ -90,13 +91,15 @@
 (defn icon-visibility-status-dot
  [public-key container-size]
  (let [status    (rf/sub [:visibility-status-updates/visibility-status-update public-key])
+        theme     (quo.theme/use-theme)
        size      (icon-dot-size container-size)
        margin    -2
        dot-color (icon-dot-color status)
        new-ui?   true]
    (merge (styles/visibility-status-dot {:color   dot-color
                                          :size    size
-                                          :new-ui? new-ui?})
+                                          :new-ui? new-ui?}
+                                         theme)
           {:bottom              margin
            :right               margin
            :position            :absolute
@@ -37,7 +37,7 @@
     (dispatch-popover page-y))))

 (defn profile-visibility-status-dot
-  [status-type color]
+  [status-type color theme]
  (let [automatic?                      (= status-type
                                           constants/visibility-status-automatic)
        [border-width margin-left size] (if automatic? [1 -10 12] [0 6 10])
@@ -50,14 +50,16 @@
                  :size         size
                  :border-width border-width
                  :margin-left  6
-                  :new-ui?      new-ui?})}])
+                  :new-ui?      new-ui?}
+                 theme)}])
     [rn/view
      {:style (styles/visibility-status-profile-dot
               {:color        color
                :size         size
                :border-width border-width
                :margin-left  margin-left
-                :new-ui?      new-ui?})}]]))
+                :new-ui?      new-ui?}
+               theme)}]]))

 (defn visibility-status-button
  [on-press props]
@@ -2,7 +2,6 @@
  (:require
    [clojure.string :as string]
    [goog.string :as gstring]
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
    [legacy.status-im.ui.components.react :as react]
    [legacy.status-im.utils.build :as build]
    [legacy.status-im.utils.deprecated-types :as types]
@@ -13,6 +12,7 @@
    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.common.log :as log]
    [status-im.config :as config]
+    [status-im.navigation.events :as navigation]
    [utils.datetime :as datetime]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -226,7 +226,7 @@
    {:db (assoc db :bug-report/description-error error)}
    (rf/merge
     cofx
-     (bottom-sheet/hide-bottom-sheet-old)
+     (navigation/hide-bottom-sheet)
     (send-logs :email))))

 (re-frame/reg-fx
@@ -254,5 +254,5 @@
  (rf/merge
   cofx
   {:db (dissoc db :bug-report/details)}
-   (bottom-sheet/hide-bottom-sheet-old)
+   (navigation/hide-bottom-sheet)
   (submit-issue)))
@@ -54,7 +54,7 @@

 (defn- f-animated-header-list
  [{:keys [header-comp main-comp back-button-on-press] :as params}]
-  (let [theme                   (quo.theme/use-theme-value)
+  (let [theme                   (quo.theme/use-theme)
        window-height           (:height (rn/get-window))
        {:keys [top bottom]}    (safe-area/get-insets)
        ;; view height calculation is different because window height is different on iOS and
@@ -29,7 +29,7 @@
                   {:height          (:size opts)
                    :width           (:size opts)
                    :borderRadius    (style/get-border-radius (:size opts))
-                    :backgroundColor (colors/resolve-color (:customization-color opts) :dark)})
+                    :backgroundColor (colors/resolve-color (:customization-color opts) :light)})
      (h/is-truthy (h/query-by-label-text :account-emoji))
      (h/has-style (h/query-by-label-text :account-emoji)
                   {:fontSize (style/get-emoji-size (:size opts))})
@@ -65,7 +65,7 @@
                   {:height          (:size opts)
                    :width           (:size opts)
                    :borderRadius    (style/get-border-radius (:size opts))
-                    :backgroundColor (colors/resolve-color (:customization-color opts) :dark)})
+                    :backgroundColor (colors/resolve-color (:customization-color opts) :light)})
      (h/is-truthy (h/query-by-label-text :account-emoji))
      (h/has-style (h/query-by-label-text :account-emoji)
                   {:fontSize (style/get-emoji-size (:size opts))})
@@ -56,9 +56,10 @@


 (defn root-container
-  [{:keys [type size theme customization-color]
+  [{:keys [type size customization-color]
    :or   {size                default-size
-           customization-color :blue}}]
+           customization-color :blue}}
+   theme]
  (let [watch-only? (= type :watch-only)
        width       (cond-> size
                      (keyword? size) (container-size size))]
@@ -5,7 +5,7 @@
    [quo.theme :as quo.theme]
    [react-native.core :as rn]))

-(defn- view-internal
+(defn view
  "Opts:
   
    :type  - keyword -> :default/:watch-only
@@ -21,15 +21,14 @@
    :or   {size  style/default-size
           emoji "🍑"}
    :as   opts}]
-  (let [emoji-size (style/get-emoji-size size)]
+  (let [theme      (quo.theme/use-theme)
+        emoji-size (style/get-emoji-size size)]
    [rn/view
     {:accessible          true
      :accessibility-label :account-avatar
-      :style               (style/root-container opts)}
+      :style               (style/root-container opts theme)}
     [rn/text
      {:accessibility-label      :account-emoji
       :adjusts-font-size-to-fit true
       :style                    {:font-size emoji-size}}
      (when emoji (string/trim emoji))]]))
-
-(def view (quo.theme/with-theme view-internal))
@@ -34,7 +34,7 @@
       :container-style style/lock-icon
       :size            12}]]))

-(defn- view-internal
+(defn view
  "Options:

  :size - keyword (default nil) - Container size, for the moment,
@@ -52,22 +52,21 @@
  :full-name - string (default nil) - When :emoji is blank, this value will be
  used to extract the initials.
  "
-  [{:keys [size emoji customization-color locked? full-name theme]}]
-  [rn/view
-   {:accessibility-label :channel-avatar
-    :style               (style/outer-container {:theme               theme
-                                                 :size                size
-                                                 :customization-color customization-color})}
-   (if (string/blank? emoji)
-     [initials
-      {:full-name           full-name
-       :size                size
-       :customization-color customization-color
-       :theme               theme}]
-     [rn/text
-      {:style               (style/emoji-size size)
-       :accessibility-label :emoji}
-      (when emoji (string/trim emoji))])
-   [lock locked? size theme]])
-
-(def view (quo.theme/with-theme view-internal))
+  [{:keys [size emoji customization-color locked? full-name]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:accessibility-label :channel-avatar
+      :style               (style/outer-container {:theme               theme
+                                                   :size                size
+                                                   :customization-color customization-color})}
+     (if (string/blank? emoji)
+       [initials
+        {:full-name           full-name
+         :size                size
+         :customization-color customization-color
+         :theme               theme}]
+       [rn/text
+        {:style               (style/emoji-size size)
+         :accessibility-label :emoji}
+        (when emoji (string/trim emoji))])
+     [lock locked? size theme]]))
@@ -4,15 +4,16 @@
    [quo.theme :as quo.theme]
    [react-native.fast-image :as fast-image]))

-(defn- view-internal
+(defn view
  "Opts:
   
    :image - collection image
    :theme - keyword -> :light/:dark"
-  [{:keys [image theme size] :or {size :size-24}}]
-  [fast-image/fast-image
-   {:accessibility-label :collection-avatar
-    :source              image
-    :style               (style/collection-avatar theme size)}])
-
-(def view (quo.theme/with-theme view-internal))
+  [{:keys [image size on-load-end on-error] :or {size :size-24}}]
+  (let [theme (quo.theme/use-theme)]
+    [fast-image/fast-image
+     {:accessibility-label :collection-avatar
+      :source              image
+      :on-load-end         on-load-end
+      :on-error            on-error
+      :style               (style/collection-avatar theme size)}]))
@@ -21,46 +21,44 @@
   :size-80 {:icon      32
             :container 80}})

-(defn- view-internal
-  [_]
-  (fn [{:keys [size theme customization-color picture icon-name emoji chat-name]
-        :or   {size                :size-20
-               customization-color :blue
-               picture             nil
-               icon-name           :i/members}}]
-    (let [container-size (get-in sizes [size :container])
-          icon-size      (get-in sizes [size :icon])]
-      [rn/view
-       {:accessibility-label :group-avatar
-        :style               (style/container {:container-size      container-size
-                                               :customization-color customization-color
-                                               :theme               theme})}
-       (if picture
-         [fast-image/fast-image
-          {:source picture
-           :style  {:width  container-size
-                    :height container-size}}]
-         (cond
-           emoji
-           (if (= size :size-80)
-             [rn/text
-              {:style (style/avatar-identifier theme)}
-              emoji]
-             [text/text
-              {:size  :paragraph-1
-               :style (dissoc (style/avatar-identifier theme) :font-size)}
-              emoji])
-           chat-name
-           (if (= size :size-80)
-             [rn/text
-              {:style (style/avatar-identifier theme)}
-              ((comp first string/upper-case) chat-name)]
-             [text/text
-              {:size :paragraph-1}
-              ((comp first string/upper-case) chat-name)])
-           :else
-           [icon/icon icon-name
-            {:size  icon-size
-             :color colors/white-opa-70}]))])))
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [size customization-color picture icon-name emoji chat-name]
+    :or   {size                :size-20
+           customization-color :blue
+           picture             nil
+           icon-name           :i/members}}]
+  (let [theme          (quo.theme/use-theme)
+        container-size (get-in sizes [size :container])
+        icon-size      (get-in sizes [size :icon])]
+    [rn/view
+     {:accessibility-label :group-avatar
+      :style               (style/container {:container-size      container-size
+                                             :customization-color customization-color
+                                             :theme               theme})}
+     (if picture
+       [fast-image/fast-image
+        {:source picture
+         :style  {:width  container-size
+                  :height container-size}}]
+       (cond
+         emoji
+         (if (= size :size-80)
+           [rn/text
+            {:style (style/avatar-identifier theme)}
+            emoji]
+           [text/text
+            {:size  :paragraph-1
+             :style (dissoc (style/avatar-identifier theme) :font-size)}
+            emoji])
+         chat-name
+         (if (= size :size-80)
+           [rn/text
+            {:style (style/avatar-identifier theme)}
+            ((comp first string/upper-case) chat-name)]
+           [text/text
+            {:size :paragraph-1}
+            ((comp first string/upper-case) chat-name)])
+         :else
+         [icon/icon icon-name
+          {:size  icon-size
+           :color colors/white-opa-70}]))]))
@@ -15,11 +15,12 @@
   :size-20 {:component 20
             :icon      12}})

-(defn icon-avatar-internal
-  [{:keys [size icon color opacity border? theme]
+(defn icon-avatar
+  [{:keys [size icon color opacity border?]
    :or   {opacity 20
           size    :size-32}}]
-  (let [{component-size :component icon-size :icon} (get sizes size)
+  (let [theme                                       (quo.theme/use-theme)
+        {component-size :component icon-size :icon} (get sizes size)
        circle-color                                (colors/resolve-color color theme opacity)
        icon-color                                  (colors/resolve-color color theme)]
    (if (keyword? icon)
@@ -38,5 +39,3 @@
      [rn/image
       {:source icon
        :style  {:width component-size :height component-size}}])))
-
-(def icon-avatar (quo.theme/with-theme icon-avatar-internal))
@@ -14,7 +14,6 @@
      [:status-indicator? {:optional true} [:maybe boolean?]]
      [:online? {:optional true} [:maybe boolean?]]
      [:ring? {:optional true} [:maybe boolean?]]
-      [:theme :schema.common/theme]
      [:profile-picture
       {:optional true}
       [:maybe :schema.quo/profile-picture-source]]]]]
@@ -66,8 +66,8 @@
     :background-color (colors/resolve-color customization-color theme)}))

 (defn indicator-color
-  []
-  {:online  (colors/theme-colors colors/success-50 colors/success-60)
+  [theme]
+  {:online  (colors/theme-colors colors/success-50 colors/success-60 theme)
   :offline colors/neutral-40})

 (defn outer
@@ -11,9 +11,10 @@
    utils.string))

 (defn initials-avatar
-  [{:keys [full-name size customization-color theme]
+  [{:keys [full-name size customization-color]
    :or   {customization-color :blue}}]
-  (let [font-size       (get-in style/sizes [size :font-size])
+  (let [theme           (quo.theme/use-theme)
+        font-size       (get-in style/sizes [size :font-size])
        amount-initials (if (#{:xs :xxs :xxxs} size) 1 2)]
    [rn/view
     {:accessibility-label :initials-avatar
@@ -31,14 +32,14 @@
   When calling the `profile-picture-fn` and passing the `:ring?` key, be aware that the `profile-picture-fn`
   may have an `:override-ring?` value. If it does then the `:ring?` value will not be used.
   For reference, refer to the `utils.image-server` namespace for these `profile-picture-fn` are generated."
-  [{:keys [full-name size profile-picture static?
-           status-indicator? online? ring? theme]
+  [{:keys [full-name size profile-picture static? status-indicator? online? ring?]
    :or   {size              :big
           status-indicator? true
           online?           true
           ring?             true}
    :as   props}]
-  (let [full-name          (or full-name "Your Name")
+  (let [theme              (quo.theme/use-theme)
+        full-name          (or full-name "Your Name")
        ;; image generated with `profile-picture-fn` is round cropped
        ;; no need to add border-radius for them
        outer-styles       (style/outer size (not (:fn profile-picture)))
@@ -49,7 +50,7 @@
        font-size          (get-in style/sizes [size :font-size])
        amount-initials    (if (#{:xs :xxs :xxxs} size) 1 2)
        sizes              (get style/sizes size)
-        indicator-color    (get (style/indicator-color) (if online? :online :offline))
+        indicator-color    (get (style/indicator-color theme) (if online? :online :offline))
        profile-picture-fn (:fn profile-picture)]

    [rn/view {:style outer-styles :accessibility-label :user-avatar}
@@ -66,7 +67,8 @@
                      {:length                   amount-initials
                       :full-name                full-name
                       :font-size                (:font-size (text/text-style {:size
-                                                                               font-size}))
+                                                                               font-size}
+                                                                              nil))
                       :indicator-size           (when status-indicator?
                                                   (:status-indicator sizes))
                       :indicator-border         (when status-indicator?
@@ -87,6 +89,4 @@

               :else {:uri profile-picture})}])]))

-(def user-avatar
-  (quo.theme/with-theme
-   (schema/instrument #'user-avatar-internal component-schema/?schema)))
+(def user-avatar (schema/instrument #'user-avatar-internal component-schema/?schema))
@@ -34,7 +34,7 @@
      (= size second-smallest-possible)))
 (def biggest-possible (last (keys properties)))

-(defn- view-internal
+(defn wallet-user-avatar
  "Options:

  :full-name - string (default: nil) - used to generate initials
@@ -44,9 +44,10 @@
  :monospace? - boolean (default: false) - use monospace font
  :lowercase? - boolean (default: false) - lowercase text
  :neutral? - boolean (default: false) - use neutral colors variant"
-  [{:keys [full-name customization-color size theme monospace? lowercase? neutral?]
+  [{:keys [full-name customization-color size monospace? lowercase? neutral?]
    :or   {size biggest-possible}}]
-  (let [circle-size (:size (size properties))
+  (let [theme       (quo.theme/use-theme)
+        circle-size (:size (size properties))
        small?      (check-if-size-small size)
        initials    (utils.string/get-initials full-name (if small? 1 2))]
    [rn/view
@@ -57,5 +58,3 @@
       :weight              (if monospace? :monospace (:font-weight (size properties)))
       :style               (style/text customization-color neutral? theme)}
      (if (and initials lowercase?) (string/lower-case initials) initials)]]))
-
-(def wallet-user-avatar (quo.theme/with-theme view-internal))
@@ -8,27 +8,26 @@
    [quo.theme :as quo.theme]
    [react-native.core :as rn]))

-(defn- view-internal
-  [{:keys [hide-pin? latest-pin-text pins-count on-press theme]}]
-  (when (pos? pins-count)
-    [rn/touchable-opacity
-     {:accessibility-label :pinned-banner
-      :style               style/container
-      :active-opacity      1
-      :on-press            on-press}
-     (when-not hide-pin?
-       [rn/view {:style style/icon}
-        [icons/icon :i/pin
-         {:color (colors/theme-colors colors/neutral-100 colors/white theme)
-          :size  20}]])
-     [rn/view {:style (style/text hide-pin?)}
-      [text/text
-       {:number-of-lines 1
-        :size            :paragraph-2}
-       latest-pin-text]]
-     [rn/view
-      {:accessibility-label :pins-count
-       :style               style/counter}
-      [counter/view {:type :secondary} pins-count]]]))
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [hide-pin? latest-pin-text pins-count on-press]}]
+  (let [theme (quo.theme/use-theme)]
+    (when (pos? pins-count)
+      [rn/touchable-opacity
+       {:accessibility-label :pinned-banner
+        :style               style/container
+        :active-opacity      1
+        :on-press            on-press}
+       (when-not hide-pin?
+         [rn/view {:style style/icon}
+          [icons/icon :i/pin
+           {:color (colors/theme-colors colors/neutral-100 colors/white theme)
+            :size  20}]])
+       [rn/view {:style (style/text hide-pin?)}
+        [text/text
+         {:number-of-lines 1
+          :size            :paragraph-2}
+         latest-pin-text]]
+       [rn/view
+        {:accessibility-label :pins-count
+         :style               style/counter}
+        [counter/view {:type :secondary} pins-count]]])))
@@ -17,7 +17,8 @@
 (defn input
  [disabled?]
  (assoc (text/text-style {:size   :paragraph-1
-                           :weight :regular})
+                           :weight :regular}
+                          nil)
         :flex       1
         :min-height 36
         :min-width  120
@@ -45,11 +46,12 @@
   :z-index            10})

 (defn text
-  []
+  [theme]
  (assoc (text/text-style {:size   :paragraph-1
-                           :weight :medium})
+                           :weight :medium}
+                          nil)
         :color
-         (colors/theme-colors colors/neutral-100 colors/white)))
+         (colors/theme-colors colors/neutral-100 colors/white theme)))

 (def root-container
  {:height             60
@@ -121,7 +121,7 @@
            :size                favicon-size}])
        [rn/text
         {:accessibility-label :browser-input-label
-          :style               (style/text)}
+          :style               (style/text theme)}
         (remove-http-https-www value)]
        (when locked?
          [lock-icon {:blur? blur? :theme theme}])])
@@ -5,7 +5,7 @@
    [quo.components.icon :as quo.icons]
    [quo.components.markdown.text :as text]
    [quo.foundations.customization-colors :as customization-colors]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.blur :as blur]
    [react-native.core :as rn]))

@@ -28,15 +28,15 @@
    :theme :light/:dark
   only icon
   [button {:icon-only? true} :i/close-circle]"
-  [{:keys [on-press on-long-press disabled? type background size icon-left icon-right icon-top
-           customization-color accessibility-label icon-only? container-style inner-style
-           pressed? on-press-in on-press-out allow-multiple-presses?]
+  [{:keys [on-press on-long-press disabled? type background size icon-left icon-left-color icon-right
+           icon-right-color icon-top icon-top-color customization-color accessibility-label icon-only?
+           container-style inner-style pressed? on-press-in on-press-out allow-multiple-presses?]
    :or   {type                :primary
           size                40
           customization-color (if (= type :primary) :blue nil)}}
   children]
  (let [[pressed-state? set-pressed-state] (rn/use-state false)
-        theme (theme/use-theme-value)
+        theme (quo.theme/use-theme)
        {:keys [icon-color background-color label-color border-color blur-type
                blur-overlay-color border-radius overlay-customization-color]}
        (button-properties/get-values {:customization-color customization-color
@@ -94,7 +94,7 @@
          [quo.icons/icon icon-top
           {:container-style {:margin-bottom 2
                              :opacity       (when disabled? 0.3)}
-            :color           icon-color
+            :color           (or icon-top-color icon-color)
            :size            icon-size}]])
       (when icon-left
         [rn/view
@@ -103,7 +103,7 @@
                    :icon-size icon-size
                    :disabled? disabled?})}
          [quo.icons/icon icon-left
-           {:color icon-color
+           {:color (or icon-left-color icon-color)
            :size  icon-size}]])
       [rn/view
        (cond
@@ -130,5 +130,5 @@
                    :icon-size icon-size
                    :disabled? disabled?})}
          [quo.icons/icon icon-right
-           {:color icon-color
+           {:color (or icon-right-color icon-color)
            :size  icon-size}]])]]]))
@@ -2,13 +2,13 @@
  (:require
    [quo.components.buttons.composer-button.style :as style]
    [quo.components.icon :as quo.icons]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]))

 (defn view
  [{:keys [on-press on-long-press disabled? blur? icon accessibility-label container-style]}]
  (let [[pressed? set-pressed] (rn/use-state false)
-        theme                  (theme/use-theme-value)
+        theme                  (quo.theme/use-theme)
        on-press-in            (rn/use-callback #(set-pressed true))
        on-press-out           (rn/use-callback #(set-pressed nil))]
    [rn/pressable
@@ -52,7 +52,7 @@
    :count               mentions or notifications count
    :customization-color customize jump-to and mention button color}"
  [{:keys [type label on-press customization-color style] :as args}]
-  (let [theme                  (quo.theme/use-theme-value)
+  (let [theme                  (quo.theme/use-theme)
        [pressed? set-pressed] (rn/use-state false)
        button-color           (get-button-color {:type                type
                                                  :pressed?            pressed?
@@ -10,7 +10,7 @@

 (defn view
  [{:keys [on-press on-long-press disabled? container-style]}]
-  (let [theme                  (quo.theme/use-theme-value)
+  (let [theme                  (quo.theme/use-theme)
        [pressed? set-pressed] (rn/use-state false)
        on-press-in            (rn/use-callback #(set-pressed true))
        on-press-out           (rn/use-callback #(set-pressed nil))]
@@ -4,7 +4,7 @@
    [quo.components.buttons.predictive-keyboard.style :as style]
    [quo.components.info.info-message :as info-message]
    [quo.foundations.colors :as colors]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]
    [react-native.linear-gradient :as linear-gradient]))

@@ -26,7 +26,7 @@
  []
  [rn/view {:style {:width 8}}])

-(defn- view-internal
+(defn view
  "Options
   - `type` `:words`/`:error`/`:info`/`:empty`.
   - `blur?` Boolean to enable blur background support.
@@ -34,43 +34,42 @@
   - `words` List of words to display in the keyboard.
   - `on-press` Callback called when a word is pressed `(fn [word])`
   - `theme` :light or :dark, received from with-theme HOC."
-  [{:keys [type blur? text words on-press theme]}]
-  [linear-gradient/linear-gradient
-   {:style               {:flex-direction :row}
-    :accessibility-label :predictive-keyboard
-    :colors              (if blur?
-                           (gradients :blur)
-                           (colors/theme-colors (gradients :light) (gradients :dark) theme))}
-   [rn/view {:style (style/wrapper type)}
-    (case type
-      :words
-      [rn/flat-list
-       {:keyboard-should-persist-taps      :always
-        :data                              words
-        :content-container-style           style/word-list
-        :render-fn                         word-component
-        :render-data                       {:on-press on-press}
-        :shows-horizontal-scroll-indicator false
-        :separator                         [separator]
-        :horizontal                        true
-        :key-fn                            str}]
+  [{:keys [type blur? text words on-press]}]
+  (let [theme (quo.theme/use-theme)]
+    [linear-gradient/linear-gradient
+     {:style               {:flex-direction :row}
+      :accessibility-label :predictive-keyboard
+      :colors              (if blur?
+                             (gradients :blur)
+                             (colors/theme-colors (gradients :light) (gradients :dark) theme))}
+     [rn/view {:style (style/wrapper type)}
+      (case type
+        :words
+        [rn/flat-list
+         {:keyboard-should-persist-taps      :always
+          :data                              words
+          :content-container-style           style/word-list
+          :render-fn                         word-component
+          :render-data                       {:on-press on-press}
+          :shows-horizontal-scroll-indicator false
+          :separator                         [separator]
+          :horizontal                        true
+          :key-fn                            str}]

-      :error
-      [info-message/info-message
-       {:icon :i/info
-        :size :default
-        :type :error}
-       text]
+        :error
+        [info-message/info-message
+         {:icon :i/info
+          :size :default
+          :type :error}
+         text]

-      :info
-      [info-message/info-message
-       (merge {:icon :i/info
-               :size :default
-               :type (if (= type :error) :error :default)}
-              (when blur?
-                {:text-color colors/white-opa-70
-                 :icon-color colors/white-opa-70}))
-       text]
-      nil)]])
-
-(def view (theme/with-theme view-internal))
+        :info
+        [info-message/info-message
+         (merge {:icon :i/info
+                 :size :default
+                 :type (if (= type :error) :error :default)}
+                (when blur?
+                  {:text-color colors/white-opa-70
+                   :icon-color colors/white-opa-70}))
+         text]
+        nil)]]))
@@ -48,7 +48,7 @@
  "
  [{:keys [on-complete track-text track-icon disabled? customization-color size
           container-style type blur?]}]
-  (let [theme                         (quo.theme/use-theme-value)
+  (let [theme                         (quo.theme/use-theme)
        x-pos                         (reanimated/use-shared-value 0)
        [track-width set-track-width] (rn/use-state nil)
        [sliding-complete?
@@ -3,12 +3,12 @@
    [quo.components.buttons.wallet-button.style :as style]
    [quo.components.icon :as quo.icons]
    [quo.foundations.colors :as colors]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]))

 (defn view
  [{:keys [on-press on-long-press disabled? icon accessibility-label container-style]}]
-  (let [theme                  (theme/use-theme-value)
+  (let [theme                  (quo.theme/use-theme)
        [pressed? set-pressed] (rn/use-state false)
        on-press-in            (rn/use-callback #(set-pressed true))
        on-press-out           (rn/use-callback #(set-pressed nil))]
@@ -23,32 +23,31 @@
     :style  {:margin-top 4
              :color      (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}} text]])

-(defn view-internal
-  [{:keys [theme buy-action send-action receive-action bridge-action]}]
-  [rn/view {:style style/container}
-   [action-button
-    {:icon                :i/add
-     :text                (i18n/label :t/buy)
-     :on-press            buy-action
-     :theme               theme
-     :accessibility-label :buy}]
-   [action-button
-    {:icon                :i/send
-     :text                (i18n/label :t/send)
-     :on-press            send-action
-     :theme               theme
-     :accessibility-label :send}]
-   [action-button
-    {:icon                :i/receive
-     :text                (i18n/label :t/receive)
-     :on-press            receive-action
-     :theme               theme
-     :accessibility-label :receive}]
-   [action-button
-    {:icon                :i/bridge
-     :text                (i18n/label :t/bridge)
-     :on-press            bridge-action
-     :theme               theme
-     :accessibility-label :bridge}]])
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [buy-action send-action receive-action bridge-action]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style style/container}
+     [action-button
+      {:icon                :i/add
+       :text                (i18n/label :t/buy)
+       :on-press            buy-action
+       :theme               theme
+       :accessibility-label :buy}]
+     [action-button
+      {:icon                :i/send
+       :text                (i18n/label :t/send)
+       :on-press            send-action
+       :theme               theme
+       :accessibility-label :send}]
+     [action-button
+      {:icon                :i/receive
+       :text                (i18n/label :t/receive)
+       :on-press            receive-action
+       :theme               theme
+       :accessibility-label :receive}]
+     [action-button
+      {:icon                :i/bridge
+       :text                (i18n/label :t/bridge)
+       :on-press            bridge-action
+       :theme               theme
+       :accessibility-label :bridge}]]))
@@ -4,13 +4,14 @@
    [quo.components.calendar.calendar.month-picker.style :as style]
    [quo.components.calendar.calendar.month-picker.utils :as utils]
    [quo.components.markdown.text :as text]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]
    [utils.number :as utils.number]))

-(defn- view-internal
-  [{:keys [year month on-change theme]}]
-  (let [year  (utils.number/parse-int year)
+(defn view
+  [{:keys [year month on-change]}]
+  (let [theme (quo.theme/use-theme)
+        year  (utils.number/parse-int year)
        month (utils.number/parse-int month)]
    [rn/view
     {:style style/container}
@@ -35,5 +36,3 @@
       :type                    :outline
       :on-press                #(on-change (utils/next-month year month))}
      :i/chevron-right]]))
-
-(def view (theme/with-theme view-internal))
@@ -6,13 +6,13 @@
    [quo.components.calendar.calendar.utils :as utils]
    [quo.components.calendar.calendar.weekdays-header.view :as weekdays-header]
    [quo.components.calendar.calendar.years-list.view :as years-list]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]
    [utils.number :as utils.number]))

 (defn view
  [{:keys [on-change start-date end-date]}]
-  (let [theme                               (theme/use-theme-value)
+  (let [theme                               (quo.theme/use-theme)
        [selected-year set-selected-year]   (rn/use-state (utils/current-year))
        [selected-month set-selected-month] (rn/use-state (utils/current-month))
        on-change-year                      (rn/use-callback #(set-selected-year %))
@@ -2,23 +2,22 @@
  (:require
    [quo.components.calendar.calendar.weekdays-header.style :as style]
    [quo.components.markdown.text :as text]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]
    [utils.datetime :as datetime]
    [utils.i18n :as i18n]))

-(defn- view-internal
-  [theme]
-  [rn/view
-   {:style style/container-weekday-row}
-   (for [weekday datetime/weekday-names]
-     [rn/view
-      {:style style/container-weekday
-       :key   weekday}
-      [text/text
-       {:weight :medium
-        :size   :paragraph-2
-        :style  (style/text-weekdays theme)}
-       (str (i18n/label weekday))]])])
-
-(def view (theme/with-theme view-internal))
+(defn view
+  []
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:style style/container-weekday-row}
+     (for [weekday datetime/weekday-names]
+       [rn/view
+        {:style style/container-weekday
+         :key   weekday}
+        [text/text
+         {:weight :medium
+          :size   :paragraph-2
+          :style  (style/text-weekdays theme)}
+         (str (i18n/label weekday))]])]))
@@ -3,7 +3,7 @@
    [quo.components.calendar.calendar-year.view :as calendar-year]
    [quo.components.calendar.calendar.utils :as utils]
    [quo.components.calendar.calendar.years-list.style :as style]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]
    [react-native.linear-gradient :as linear-gradient]))

@@ -30,21 +30,20 @@
    :start  {:x 0 :y 0}
    :end    {:x 0 :y 1}}])

-(defn view-internal
-  [{:keys [on-change-year year theme]}]
-  [rn/view
-   {:style (style/container-years theme)}
-   [rn/flat-list
-    {:data                            (utils/generate-years (utils/current-year))
-     :key-fn                          str
-     :list-key                        :years-list
-     :inverted                        true
-     :shows-vertical-scroll-indicator false
-     :footer                          [footer]
-     :separator                       [separator]
-     :render-fn                       year-view
-     :render-data                     {:selected-year year
-                                       :on-press      #(on-change-year %)}}]
-   [gradiant-overview theme]])
-
-(def view (theme/with-theme view-internal))
+(defn view
+  [{:keys [on-change-year year]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:style (style/container-years theme)}
+     [rn/flat-list
+      {:data                            (utils/generate-years (utils/current-year))
+       :key-fn                          str
+       :list-key                        :years-list
+       :inverted                        true
+       :shows-vertical-scroll-indicator false
+       :footer                          [footer]
+       :separator                       [separator]
+       :render-fn                       year-view
+       :render-data                     {:selected-year year
+                                         :on-press      #(on-change-year %)}}]
+     [gradiant-overview theme]]))
@@ -2,31 +2,30 @@
  (:require
    [quo.components.calendar.calendar-day.style :as style]
    [quo.components.markdown.text :as text]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]))

-(defn- view-internal
-  [{:keys [state in-range on-press customization-color theme]
+(defn view
+  [{:keys [state in-range on-press customization-color]
    :or   {state :default}}
   day]
-  [rn/view {:style style/wrapper}
-   [rn/view {:style (style/in-range-background {:in-range in-range :theme theme})}]
-   [rn/touchable-opacity
-    {:on-press on-press
-     :style    (style/container
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style style/wrapper}
+     [rn/view {:style (style/in-range-background {:in-range in-range :theme theme})}]
+     [rn/touchable-opacity
+      {:on-press on-press
+       :style    (style/container
+                  {:state               state
+                   :theme               theme
+                   :customization-color customization-color})
+       :disabled (= state :disabled)}
+      [text/text
+       {:weight :medium
+        :size   :paragraph-2
+        :style  (style/text {:state state :theme theme})}
+       day]
+      [rn/view
+       {:style (style/indicator
                {:state               state
                 :theme               theme
-                 :customization-color customization-color})
-     :disabled (= state :disabled)}
-    [text/text
-     {:weight :medium
-      :size   :paragraph-2
-      :style  (style/text {:state state :theme theme})}
-     day]
-    [rn/view
-     {:style (style/indicator
-              {:state               state
-               :theme               theme
-               :customization-color customization-color})}]]])
-
-(def view (theme/with-theme view-internal))
+                 :customization-color customization-color})}]]]))
@@ -2,24 +2,23 @@
  (:require
    [quo.components.calendar.calendar-year.style :as style]
    [quo.components.markdown.text :as text]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]))

-(defn- view-internal
-  [{:keys [selected? disabled? on-press theme]} year]
-  [rn/touchable-opacity
-   {:on-press on-press
-    :style    (style/container
-               {:selected? selected?
-                :disabled? disabled?
-                :theme     theme})
-    :disabled disabled?}
-   [text/text
-    {:weight :medium
-     :size   :paragraph-2
-     :style  (style/text
-              {:selected? selected?
-               :theme     theme})}
-    year]])
-
-(def view (theme/with-theme view-internal))
+(defn view
+  [{:keys [selected? disabled? on-press]} year]
+  (let [theme (quo.theme/use-theme)]
+    [rn/touchable-opacity
+     {:on-press on-press
+      :style    (style/container
+                 {:selected? selected?
+                  :disabled? disabled?
+                  :theme     theme})
+      :disabled disabled?}
+     [text/text
+      {:weight :medium
+       :size   :paragraph-2
+       :style  (style/text
+                {:selected? selected?
+                 :theme     theme})}
+      year]]))
@@ -1,16 +1,12 @@
 (ns quo.components.code.snippet.view
  (:require
-    [quo.components.code.common.view :as code-common]
-    [quo.theme :as theme]))
+    [quo.components.code.common.view :as code-common]))

-(defn- view-internal
-  [_]
-  (fn [{:keys [language max-lines on-copy-press]} children]
-    [code-common/view
-     {:language      language
-      :max-lines     max-lines
-      :on-copy-press on-copy-press
-      :preview?      false}
-     children]))
-
-(def view (theme/with-theme view-internal))
+(defn view
+  [{:keys [language max-lines on-copy-press]} children]
+  [code-common/view
+   {:language      language
+    :max-lines     max-lines
+    :on-copy-press on-copy-press
+    :preview?      false}
+   children])
@@ -14,16 +14,11 @@
   [rn/view {:style (style/left-half theme)}]
   [rn/view {:style (style/right-half theme)}]])

-(defn- view-internal
-  [{:keys [color
-           selected?
-           on-press
-           blur?
-           theme
-           idx
-           window-width]
+(defn view
+  [{:keys [color selected? on-press blur? idx window-width]
    :as   props}]
-  (let [border?   (and (not blur?) (not selected?))
+  (let [theme     (quo.theme/use-theme)
+        border?   (and (not blur?) (not selected?))
        hex-color (if (= :feng-shui color)
                    (colors/theme-colors colors/neutral-100 colors/white theme)
                    (colors/theme-colors (colors/custom-color color 50)
@@ -38,6 +33,7 @@
     (if (and (= :feng-shui color) (not selected?))
       [feng-shui
        (assoc props
+               :theme     theme
               :hex-color hex-color
               :border?   border?)]
       [rn/view
@@ -49,5 +45,3 @@
            :color (if (= :feng-shui color)
                     (colors/theme-colors colors/white colors/neutral-100 theme)
                     colors/white)}])])]))
-
-(def view (quo.theme/with-theme view-internal))
@@ -4,9 +4,8 @@
    [quo.theme :as quo.theme]
    [react-native.core :as rn]))

-(defn- view-internal
-  [{:keys [blur? theme]}]
-  [rn/text {:style (style/text blur? theme)}
-   "not implemented"])
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [blur?]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/text {:style (style/text blur? theme)}
+     "not implemented"]))
@@ -4,12 +4,11 @@
    [quo.theme :as quo.theme]
    [react-native.core :as rn]))

-(defn view-internal
-  [{:keys [customization-color style theme blur?]}]
-  [rn/view
-   {:accessibility-label :notification-dot
-    :style               (merge
-                          (style/notification-dot customization-color theme blur?)
-                          style)}])
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [customization-color style blur?]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:accessibility-label :notification-dot
+      :style               (merge
+                            (style/notification-dot customization-color theme blur?)
+                            style)}]))
@@ -1,16 +1,19 @@
 (ns quo.components.common.separator.view
  (:require
    [quo.foundations.colors :as quo.colors]
+    [quo.theme]
    [react-native.core :as rn]))

 (defn separator
  [{:keys [style]}]
-  [rn/view
-   {:style
-    (merge
-     style
-     {:background-color (quo.colors/theme-colors
-                         quo.colors/neutral-10
-                         quo.colors/neutral-80)
-      :align-self       :stretch
-      :height           1})}])
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:style
+      (merge
+       style
+       {:background-color (quo.colors/theme-colors
+                           quo.colors/neutral-10
+                           quo.colors/neutral-80
+                           theme)
+        :align-self       :stretch
+        :height           1})}]))
@@ -2,10 +2,12 @@
  (:require
    [quo.foundations.colors :as colors]))

-(def unread-grey-dot
+(defn unread-grey-dot
+  [theme]
  {:width            8
   :height           8
   :border-radius    4
   :background-color (colors/theme-colors
                      colors/neutral-40
-                      colors/neutral-60)})
+                      colors/neutral-60
+                      theme)})
@@ -1,10 +1,12 @@
 (ns quo.components.common.unread-grey-dot.view
  (:require
    [quo.components.common.unread-grey-dot.style :as style]
+    [quo.theme]
    [react-native.core :as rn]))

 (defn unread-grey-dot
  [accessibility-label]
-  [rn/view
-   (cond-> {:style style/unread-grey-dot}
-     accessibility-label (assoc :accessibility-label accessibility-label :accessible true))])
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     (cond-> {:style (style/unread-grey-dot theme)}
+       accessibility-label (assoc :accessibility-label accessibility-label :accessible true))]))
@@ -3,7 +3,7 @@
    [quo.components.community.banner.style :as style]
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]))

 (defn- card-title-and-description
@@ -26,16 +26,15 @@
      :size                :paragraph-2}
     description]]])

-(defn view-internal
-  [{:keys [title description on-press accessibility-label banner style theme]}]
-  [rn/touchable-without-feedback
-   {:on-press            on-press
-    :accessibility-label accessibility-label}
-   [rn/view {:style (merge (style/community-card theme) style)}
-    [card-title-and-description title description theme]
-    [rn/image
-     {:style               style/discover-illustration
-      :source              banner
-      :accessibility-label :discover-communities-illustration}]]])
-
-(def view (theme/with-theme view-internal))
+(defn view
+  [{:keys [title description on-press accessibility-label banner style]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/touchable-without-feedback
+     {:on-press            on-press
+      :accessibility-label accessibility-label}
+     [rn/view {:style (merge (style/community-card theme) style)}
+      [card-title-and-description title description theme]
+      [rn/image
+       {:style               style/discover-illustration
+        :source              banner
+        :accessibility-label :discover-communities-illustration}]]]))
@@ -9,7 +9,7 @@

 (defn view
  [{:keys [big? customization-color label counter-value icon on-press accessibility-label disabled?]}]
-  (let [theme                  (quo.theme/use-theme-value)
+  (let [theme                  (quo.theme/use-theme)
        [pressed? set-pressed] (rn/use-state false)
        on-press-in            (rn/use-callback #(set-pressed true))
        on-press-out           (rn/use-callback #(set-pressed false))]
@@ -7,33 +7,34 @@
    [react-native.core :as rn]))

 (defn- loading-card-view
-  [{:keys [width theme]}]
-  [rn/view {:style (style/loading-card width theme)}
-   [rn/view (style/loading-cover-container theme)]
-   [rn/view (style/loading-content-container theme)
-    [rn/view (style/loading-avatar theme)]
-    [rn/view (style/loading-lock theme)]
-    [rn/view
-     {:style style/loading-card-content-container}
-     [rn/view {:style (style/loading-content-line {:theme theme :width 84 :margin-top 0})}]
-     [rn/view {:style (style/loading-content-line {:theme theme :width 311 :margin-top 8})}]
-     [rn/view {:style (style/loading-content-line {:theme theme :width 271 :margin-top 8})}]]
-    [rn/view
-     {:style style/loading-stats-container}
-     [rn/view {:style (style/loading-stat-circle theme 0)}]
-     [rn/view {:style (style/loading-stat-line theme 4)}]
-     [rn/view {:style (style/loading-stat-circle theme 12)}]
-     [rn/view {:style (style/loading-stat-line theme 4)}]]
-    [rn/view
-     {:style style/loading-tags-container}
-     [rn/view {:style (style/loading-tag theme 0)}]
-     [rn/view {:style (style/loading-tag theme 8)}]
-     [rn/view {:style (style/loading-tag theme 8)}]]]])
+  [{:keys [width]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style (style/loading-card width theme)}
+     [rn/view (style/loading-cover-container theme)]
+     [rn/view (style/loading-content-container theme)
+      [rn/view (style/loading-avatar theme)]
+      [rn/view (style/loading-lock theme)]
+      [rn/view
+       {:style style/loading-card-content-container}
+       [rn/view {:style (style/loading-content-line {:theme theme :width 84 :margin-top 0})}]
+       [rn/view {:style (style/loading-content-line {:theme theme :width 311 :margin-top 8})}]
+       [rn/view {:style (style/loading-content-line {:theme theme :width 271 :margin-top 8})}]]
+      [rn/view
+       {:style style/loading-stats-container}
+       [rn/view {:style (style/loading-stat-circle theme 0)}]
+       [rn/view {:style (style/loading-stat-line theme 4)}]
+       [rn/view {:style (style/loading-stat-circle theme 12)}]
+       [rn/view {:style (style/loading-stat-line theme 4)}]]
+      [rn/view
+       {:style style/loading-tags-container}
+       [rn/view {:style (style/loading-tag theme 0)}]
+       [rn/view {:style (style/loading-tag theme 8)}]
+       [rn/view {:style (style/loading-tag theme 8)}]]]]))

 (defn- community-card-view
-  [{:keys [community on-press width theme]}]
-  (let [{:keys [name description locked? images cover
-                status tokens tags]} community]
+  [{:keys [community on-press width]}]
+  (let [theme                                                              (quo.theme/use-theme)
+        {:keys [name description locked? images cover status tokens tags]} community]
    [rn/touchable-without-feedback
     {:accessibility-label :community-card-item
      :on-press            on-press}
@@ -68,10 +69,8 @@
         [rn/view {:style (style/community-tags-position)}
          [community-view/community-tags {:tags tags}]]]]]]]))

-(defn- internal-view
+(defn view
  [{:keys [loading?] :as props}]
  (if-not loading?
    [community-card-view props]
    [loading-card-view props]))
-
-(def view (quo.theme/with-theme internal-view))
@@ -6,6 +6,7 @@
            [quo.components.tags.collectible-tag.view :as collectible-tag]
            [quo.components.tags.token-tag.view :as token-tag]
            [quo.foundations.colors :as colors]
+            [quo.theme]
            [react-native.core :as rn]
            [utils.i18n :as i18n]))

@@ -28,20 +29,21 @@

 (defn- tokens-row
  [{:keys [tokens divider? first?]}]
-  [:<>
-   [rn/view
-    {:style (style/token-row first?)}
-    (map-indexed (fn [token-index token]
-                   ^{:key (str "token-" token-index)}
-                   [token-view token])
-                 tokens)]
-   (when-not divider?
-     [divider-label/view
-      {:container-style style/divider}
-      [text/text
-       {:size  :label
-        :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}}
-       (string/lower-case (i18n/label :t/or))]])])
+  (let [theme (quo.theme/use-theme)]
+    [:<>
+     [rn/view
+      {:style (style/token-row first?)}
+      (map-indexed (fn [token-index token]
+                     ^{:key (str "token-" token-index)}
+                     [token-view token])
+                   tokens)]
+     (when-not divider?
+       [divider-label/view
+        {:container-style style/divider}
+        [text/text
+         {:size  :label
+          :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
+         (string/lower-case (i18n/label :t/or))]])]))

 (defn- role-view
  [{:keys [role tokens satisfied? role-text]}]
@@ -38,110 +38,94 @@
     unread-messages?
     [unread-grey-dot :unviewed-messages-public])])

-(defn- communities-list-view-item-internal
-  [{:keys [theme customization-color] :as props}
-   {:keys [name
-           locked?
-           status
-           muted
-           unread-messages?
-           unread-mentions-count
-           community-icon
-           tokens]}]
-  [rn/view
-   {:style (merge (style/community-card 16 theme)
-                  {:margin-bottom 12})}
-   [rn/touchable-highlight
-    (merge {:style {:height        56
-                    :border-radius 16}}
-           props)
-    [rn/view {:style style/detail-container}
-     [rn/view (style/list-info-container)
+(defn communities-list-view-item
+  [{:keys [customization-color] :as props}
+   {:keys [name locked? status muted unread-messages? unread-mentions-count community-icon tokens]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:style (merge (style/community-card 16 theme)
+                    {:margin-bottom 12})}
+     [rn/touchable-highlight
+      (merge {:style {:height        56
+                      :border-radius 16}}
+             props)
+      [rn/view {:style style/detail-container}
+       [rn/view (style/list-info-container)
+        [community-icon/community-icon
+         {:images community-icon} 32]
+        [rn/view
+         {:flex              1
+          :margin-horizontal 12}
+         [text/text
+          {:weight              :semi-bold
+           :size                :paragraph-1
+           :accessibility-label :community-name-text
+           :number-of-lines     1
+           :ellipsize-mode      :tail
+           :style               {:color (when muted
+                                          (colors/theme-colors
+                                           colors/neutral-40
+                                           colors/neutral-60
+                                           theme))}}
+          name]
+         [community-view/community-stats-column
+          {:type :list-view}]]
+        (if (= status :gated)
+          [community-view/permission-tag-container
+           {:locked? locked?
+            :tokens  tokens}]
+          [notification-view
+           {:customization-color   customization-color
+            :theme                 theme
+            :muted?                muted
+            :unread-mentions-count unread-mentions-count
+            :unread-messages?      unread-messages?}])]]]]))
+
+(defn communities-membership-list-item
+  [{:keys [customization-color] :as props}
+   bottom-sheet?
+   {:keys [name muted unviewed-messages-count unviewed-mentions-count status
+           images tokens locked? style]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/touchable-highlight
+     (merge {:underlay-color (colors/theme-colors
+                              colors/neutral-5
+                              colors/neutral-95
+                              theme)
+             :style          {:border-radius 12
+                              :margin-left   12}}
+            props)
+     [rn/view (merge (style/membership-info-container) style)
      [community-icon/community-icon
-       {:images community-icon} 32]
+       {:images images} 32]
      [rn/view
-       {:flex              1
-        :margin-horizontal 12}
+       {:flex            1
+        :margin-left     12
+        :justify-content :center}
       [text/text
-        {:weight              :semi-bold
-         :size                :paragraph-1
-         :accessibility-label :community-name-text
+        {:accessibility-label :chat-name-text
         :number-of-lines     1
         :ellipsize-mode      :tail
-         :style               {:color (when muted
-                                        (colors/theme-colors
+         :weight              :semi-bold
+         :size                :paragraph-1
+         :style               (when muted
+                                {:color (colors/theme-colors
                                         colors/neutral-40
                                         colors/neutral-60
-                                         theme))}}
-        name]
-       [community-view/community-stats-column
-        {:type :list-view}]]
-      (if (= status :gated)
-        [community-view/permission-tag-container
-         {:locked? locked?
-          :tokens  tokens}]
-        [notification-view
-         {:customization-color   customization-color
-          :theme                 theme
-          :muted?                muted
-          :unread-mentions-count unread-mentions-count
-          :unread-messages?      unread-messages?}])]]]])
+                                         theme)})}
+        name]]

-(def communities-list-view-item (quo.theme/with-theme communities-list-view-item-internal))
-
-(defn- communities-membership-list-item-internal
-  [{:keys [theme customization-color] :as props}
-   bottom-sheet?
-   {:keys [name
-           muted
-           unviewed-messages-count
-           unviewed-mentions-count
-           status
-           images
-           tokens
-           locked?
-           style]}]
-  [rn/touchable-highlight
-   (merge {:underlay-color (colors/theme-colors
-                            colors/neutral-5
-                            colors/neutral-95
-                            theme)
-           :style          {:border-radius 12
-                            :margin-left   12}}
-          props)
-   [rn/view (merge (style/membership-info-container) style)
-    [community-icon/community-icon
-     {:images images} 32]
-    [rn/view
-     {:flex            1
-      :margin-left     12
-      :justify-content :center}
-     [text/text
-      {:accessibility-label :chat-name-text
-       :number-of-lines     1
-       :ellipsize-mode      :tail
-       :weight              :semi-bold
-       :size                :paragraph-1
-       :style               (when muted
-                              {:color (colors/theme-colors
-                                       colors/neutral-40
-                                       colors/neutral-60
-                                       theme)})}
-      name]]
-
-    [rn/view
-     {:justify-content :center
-      :margin-right    (when bottom-sheet?
-                         16)}
-     (if (= status :gated)
-       [community-view/permission-tag-container
-        {:locked? locked?
-         :tokens  tokens}]
-       [notification-view
-        {:theme                 theme
-         :customization-color   customization-color
-         :muted?                muted
-         :unread-mentions-count unviewed-mentions-count
-         :unread-messages?      (pos? unviewed-messages-count)}])]]])
-
-(def communities-membership-list-item (quo.theme/with-theme communities-membership-list-item-internal))
+      [rn/view
+       {:justify-content :center
+        :margin-right    (when bottom-sheet?
+                           16)}
+       (if (= status :gated)
+         [community-view/permission-tag-container
+          {:locked? locked?
+           :tokens  tokens}]
+         [notification-view
+          {:theme                 theme
+           :customization-color   customization-color
+           :muted?                muted
+           :unread-mentions-count unviewed-mentions-count
+           :unread-messages?      (pos? unviewed-messages-count)}])]]]))
@@ -7,20 +7,19 @@
            [react-native.core :as rn]
            utils.money))

-(defn view-internal
-  [{:keys [value icon theme style accessibility-label text-size]}]
-  [rn/view
-   {:style               (merge style/container style)
-    :accessibility-label accessibility-label}
-   [quo.icons/icon icon
-    {:size            16
-     :container-style {:align-items     :center
-                       :justify-content :center}
-     :resize-mode     :center
-     :color           (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
-   [quo.text/text
-    {:size   (or text-size :paragraph-1)
-     :weight :regular
-     :style  (style/text theme)} (utils.money/format-amount value)]])
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [value icon style accessibility-label text-size]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:style               (merge style/container style)
+      :accessibility-label accessibility-label}
+     [quo.icons/icon icon
+      {:size            16
+       :container-style {:align-items     :center
+                         :justify-content :center}
+       :resize-mode     :center
+       :color           (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
+     [quo.text/text
+      {:size   (or text-size :paragraph-1)
+       :weight :regular
+       :style  (style/text theme)} (utils.money/format-amount value)]]))
@@ -6,7 +6,7 @@
    [quo.components.tags.permission-tag :as permission]
    [quo.components.tags.tag :as tag]
    [quo.foundations.colors :as colors]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]
    [react-native.gesture :as gesture]))

@@ -70,16 +70,15 @@
       :style               {:margin-top (if (= size :large) 8 2)}}
      description])])

-(defn- permission-tag-container-internal
-  [{:keys [locked? blur? tokens on-press theme]}]
-  [permission/tag
-   {:accessibility-label :permission-tag
-    :background-color    (if (and (= :dark theme) blur?)
-                           colors/white-opa-10
-                           (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))
-    :locked?             locked?
-    :tokens              tokens
-    :size                24
-    :on-press            on-press}])
-
-(def permission-tag-container (theme/with-theme permission-tag-container-internal))
+(defn permission-tag-container
+  [{:keys [locked? blur? tokens on-press]}]
+  (let [theme (quo.theme/use-theme)]
+    [permission/tag
+     {:accessibility-label :permission-tag
+      :background-color    (if (and (= :dark theme) blur?)
+                             colors/white-opa-10
+                             (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))
+      :locked?             locked?
+      :tokens              tokens
+      :size                24
+      :on-press            on-press}]))
@@ -24,22 +24,21 @@
                                      purchasable? :add)}]])
                tokens)])

-(defn- internal-view
-  [{:keys [tokens padding? theme]}]
-  [:<>
-   (if (> (count tokens) 1)
-     (map-indexed
-      (fn [token-requirement-index tokens]
-        ^{:key token-requirement-index}
-        [rn/view {:margin-bottom 12}
-         (when-not (= token-requirement-index 0)
-           [rn/view {:style (style/token-row-or-border theme)}])
-         (when-not (= token-requirement-index 0)
-           [text/text
-            {:style (style/token-row-or-text padding? theme)
-             :size  :label} (string/lower-case (i18n/label :t/or))])
-         [token-requirement-list-row tokens padding?]])
-      tokens)
-     [token-requirement-list-row (first tokens) padding?])])
-
-(def token-requirement-list (quo.theme/with-theme internal-view))
+(defn token-requirement-list
+  [{:keys [tokens padding?]}]
+  (let [theme (quo.theme/use-theme)]
+    [:<>
+     (if (> (count tokens) 1)
+       (map-indexed
+        (fn [token-requirement-index tokens]
+          ^{:key token-requirement-index}
+          [rn/view {:margin-bottom 12}
+           (when-not (= token-requirement-index 0)
+             [rn/view {:style (style/token-row-or-border theme)}])
+           (when-not (= token-requirement-index 0)
+             [text/text
+              {:style (style/token-row-or-text padding? theme)
+               :size  :label} (string/lower-case (i18n/label :t/or))])
+           [token-requirement-list-row tokens padding?]])
+        tokens)
+       [token-requirement-list-row (first tokens) padding?])]))
@@ -3,14 +3,14 @@
    [quo.foundations.colors :as colors]))

 (defn- get-background-color
-  [{:keys [status theme]}]
+  [{:keys [status]} theme]
  (case status
    :default (colors/theme-colors colors/white-opa-70 colors/neutral-95-opa-70 theme)
    :error   (colors/resolve-color :danger theme 10)
    (colors/theme-colors colors/white-opa-70 colors/neutral-95-opa-70 theme)))

 (defn- get-container-border-styles
-  [{:keys [status theme]}]
+  [{:keys [status]} theme]
  (when (= status :error)
    {:border-color (colors/resolve-color :danger theme 20)
     :border-width 1}))
@@ -29,17 +29,17 @@
      style-size-32)))

 (defn container
-  [props]
+  [props theme]
  (merge {:align-self       :flex-start
          :flex-direcrion   :row
          :justify-content  :center
          :border-radius    999
-          :background-color (get-background-color props)}
-         (get-container-border-styles props)
+          :background-color (get-background-color props theme)}
+         (get-container-border-styles props theme)
         (get-container-styles-by-size props)))

 (defn- get-text-color
-  [{:keys [status theme]}]
+  [{:keys [status]} theme]
  (case status
    :default (colors/theme-colors colors/neutral-100 colors/white theme)
    :error   (colors/resolve-color :danger theme)
@@ -53,5 +53,5 @@
    :paragraph-1))

 (defn text
-  [props]
-  {:color (get-text-color props)})
+  [props theme]
+  {:color (get-text-color props theme)})
@@ -15,26 +15,24 @@
      [:value {:optional true} [:maybe [:or :string :int]]]
      [:status {:optional true} [:maybe :keyword]]
      [:size {:optional true} [:maybe [:enum :size-32 :size-24]]]
-      [:accessibility-label {:optional true} [:maybe :keyword]]
-      [:theme :schema.common/theme]]]]
+      [:accessibility-label {:optional true} [:maybe :keyword]]]]]
   :any])

 (defn- view-internal
  [{:keys [value accessibility-label container-style]
    :as   props}]
-  (let [default-props {:status :default
+  (let [theme         (quo.theme/use-theme)
+        default-props {:status :default
                       :size   :size-32}
        props         (merge default-props props)]
    [rn/view
     {:accessible          true
      :accessibility-label (or accessibility-label :collectible-counter)
-      :style               (merge (style/container props) container-style)}
+      :style               (merge (style/container props theme) container-style)}
     [text/text
      {:weight :medium
       :size   (style/get-text-size props)
-       :style  (style/text props)}
+       :style  (style/text props theme)}
      value]]))

-(def view
-  (quo.theme/with-theme
-   (schema/instrument #'view-internal ?schema)))
+(def view (schema/instrument #'view-internal ?schema))
@@ -7,11 +7,12 @@
    [react-native.core :as rn]
    [utils.number]))

-(defn- view-internal
-  [{:keys [type customization-color theme container-style accessibility-label max-value]
-    :or   {max-value 99 customization-color :blue theme :dark}}
+(defn view
+  [{:keys [type customization-color container-style accessibility-label max-value]
+    :or   {max-value 99 customization-color :blue}}
   value]
-  (let [type  (or type :default)
+  (let [theme (quo.theme/use-theme)
+        type  (or type :default)
        value (utils.number/parse-int value)
        label (if (> value max-value)
                (str max-value "+")
@@ -33,5 +34,3 @@
       :size   :label
       :style  (when (= type :default) {:color colors/white})}
      label]]))
-
-(def view (quo.theme/with-theme view-internal))
@@ -15,14 +15,14 @@
      [:accessibility-label {:optional true} [:maybe :keyword]]
      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
      [:in-blur-view? {:optional true} [:maybe :boolean]]
-      [:theme :schema.common/theme]
      [:type {:optional true} [:enum :active :complete :neutral]]]]
    [:value [:maybe [:or :string :int]]]]
   :any])

 (defn- view-internal
-  [{:keys [type accessibility-label theme in-blur-view? customization-color]} value]
-  (let [type  (or type :neutral)
+  [{:keys [type accessibility-label in-blur-view? customization-color]} value]
+  (let [theme (quo.theme/use-theme)
+        type  (or type :neutral)
        value (utils.number/parse-int value)
        label (str value)
        size  (count label)]
@@ -40,6 +40,4 @@
       :style  {:color (style/text-color type theme)}}
      label]]))

-(def view
-  (quo.theme/with-theme
-   (schema/instrument #'view-internal ?schema)))
+(def view (schema/instrument #'view-internal ?schema))
@@ -3,21 +3,25 @@
    [quo.components.common.separator.view :as separator]
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
+    [quo.theme]
    [react-native.core :as rn]))

 (defn date
  [value]
-  [rn/view
-   {:padding-top    8
-    :padding-bottom 12
-    :padding-right  20
-    :padding-left   60}
-   [text/text
-    {:weight              :medium
-     :accessibility-label :divider-date-text
-     :size                :label
-     :style               {:color          (colors/theme-colors colors/neutral-50 colors/neutral-40)
-                           :text-transform :capitalize
-                           :margin-bottom  4}}
-    value]
-   [separator/separator]])
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:padding-top    8
+      :padding-bottom 12
+      :padding-right  20
+      :padding-left   60}
+     [text/text
+      {:weight              :medium
+       :accessibility-label :divider-date-text
+       :size                :label
+       :style               {:color          (colors/theme-colors colors/neutral-50
+                                                                  colors/neutral-40
+                                                                  theme)
+                             :text-transform :capitalize
+                             :margin-bottom  4}}
+      value]
+     [separator/separator]]))
@@ -20,42 +20,35 @@
  - `container-style` - Style applied to the container view.

  label - String or markdown text component to display in the divider label."
-  [{:keys [counter?
-           counter-value
-           chevron
-           chevron-icon
-           tight?
-           blur?
-           theme
-           on-press
-           container-style]
+  [{:keys [counter? counter-value chevron chevron-icon tight? blur? on-press container-style]
    :or   {tight? true}}
   label]
-  [rn/pressable
-   {:on-press            on-press
-    :accessibility-label :divider-label
-    :style               (merge (style/container blur? tight? chevron theme)
-                                container-style)}
-   [rn/view
-    {:style (style/content chevron)}
-    (when chevron
-      [icons/icon (or chevron-icon :i/chevron-right)
-       {:color           (style/get-content-color blur? theme)
-        :container-style {(if (= chevron :right)
-                            :margin-left
-                            :margin-right)
-                          2}}])
-    [text/text
-     {:size   :paragraph-2
-      :weight :medium
-      :style  (style/text blur? theme)}
-     label]]
-   (when counter?
-     [counter/view
-      {:type            (if blur? :secondary :grey)
-       :container-style {:margin-left 2}}
-      counter-value])])
+  (let [theme (quo.theme/use-theme)]
+    [rn/pressable
+     {:on-press            on-press
+      :accessibility-label :divider-label
+      :style               (merge (style/container blur? tight? chevron theme)
+                                  container-style)}
+     [rn/view
+      {:style (style/content chevron)}
+      (when chevron
+        [icons/icon (or chevron-icon :i/chevron-right)
+         {:color           (style/get-content-color blur? theme)
+          :container-style {(if (= chevron :right)
+                              :margin-left
+                              :margin-right)
+                            2}}])
+      [text/text
+       {:size   :paragraph-2
+        :weight :medium
+        :style  (style/text blur? theme)}
+       label]]
+     (when counter?
+       [counter/view
+        {:type            (if blur? :secondary :grey)
+         :container-style {:margin-left 2}}
+        counter-value])]))

 (defn view
-  ([_ _] (quo.theme/with-theme view-internal))
+  ([props label] [view-internal props label])
  ([label] [view {} label]))
@@ -3,7 +3,7 @@
    [quo.foundations.colors :as colors]))

 (defn divider-line
-  [{:keys [blur? container-style theme]}]
+  [{:keys [blur? container-style]} theme]
  (merge
   {:border-color        (if blur?
                           (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5 theme)
@@ -4,8 +4,7 @@
    [quo.theme :as quo.theme]
    [react-native.core :as rn]))

-(defn- view-internal
+(defn view
  [props]
-  [rn/view {:style (style/divider-line props)}])
-
-(def view (quo.theme/with-theme view-internal))
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style (style/divider-line props theme)}]))
@@ -6,10 +6,11 @@
    [react-native.core :as rn]
    [react-native.linear-gradient :as linear-gradient]))

-(defn- view-internal
+(defn view
  "new-messages params - label, customization-color, theme"
-  [{:keys [label customization-color theme] :or {customization-color :blue}}]
-  (let [bg-color   (colors/resolve-color customization-color theme 5)
+  [{:keys [label customization-color] :or {customization-color :blue}}]
+  (let [theme      (quo.theme/use-theme)
+        bg-color   (colors/resolve-color customization-color theme 5)
        text-color (colors/resolve-color customization-color theme)]
    [linear-gradient/linear-gradient
     {:colors [bg-color "rgba(0,0,0,0)"]
@@ -24,5 +25,3 @@
        :weight :medium
        :style  {:color text-color}}
       label]]]))
-
-(def view (quo.theme/with-theme view-internal))
@@ -26,88 +26,73 @@
    [rn/view (dissoc props :on-press) child]
    [rn/touchable-highlight props child]))

-(defn- action-internal
-  [{:keys [icon
-           label
-           sub-label
-           right-icon
-           right-text
-           danger?
-           disabled?
-           on-press
-           add-divider?
-           theme
-           accessibility-label
-           icon-color
-           no-icon-color?
-           state
-           customization-color
-           blur?]}]
-  [:<>
-   (when add-divider?
-     [divider theme blur?])
-   [maybe-pressable disabled?
-    {:accessibility-label accessibility-label
-     :style               (style/container {:sub-label           sub-label
-                                            :disabled?           disabled?
-                                            :state               state
-                                            :customization-color customization-color
-                                            :blur?               blur?
-                                            :theme               theme})
-     :underlay-color      (colors/theme-colors colors/neutral-5 colors/neutral-90 theme)
-     :on-press            on-press}
-    [rn/view
-     {:style (style/row-container sub-label)}
-     (when icon
+(defn action
+  [{:keys [icon label sub-label right-icon right-text danger? disabled? on-press add-divider?
+           accessibility-label icon-color no-icon-color? state customization-color blur?]}]
+  (let [theme (quo.theme/use-theme)]
+    [:<>
+     (when add-divider?
+       [divider theme blur?])
+     [maybe-pressable disabled?
+      {:accessibility-label accessibility-label
+       :style               (style/container {:sub-label           sub-label
+                                              :disabled?           disabled?
+                                              :state               state
+                                              :customization-color customization-color
+                                              :blur?               blur?
+                                              :theme               theme})
+       :underlay-color      (colors/theme-colors colors/neutral-5 colors/neutral-90 theme)
+       :on-press            on-press}
+      [rn/view
+       {:style (style/row-container sub-label)}
+       (when icon
+         [rn/view
+          {:accessibility-label :left-icon-for-action
+           :accessible          true
+           :style               (style/left-icon sub-label)}
+          [icon/icon icon
+           {:color    (or icon-color (get-icon-color danger? theme))
+            :no-color no-icon-color?
+            :size     20}]])
       [rn/view
-        {:accessibility-label :left-icon-for-action
-         :accessible          true
-         :style               (style/left-icon sub-label)}
-        [icon/icon icon
-         {:color    (or icon-color (get-icon-color danger? theme))
-          :no-color no-icon-color?
-          :size     20}]])
-     [rn/view
-      {:style style/text-container}
-      [text/text
-       {:size   :paragraph-1
-        :weight :medium
-        :style  {:color
-                 (cond
-                   danger? (colors/theme-colors colors/danger-50 colors/danger-60 theme)
-                   :else   (colors/theme-colors colors/neutral-100 colors/white theme))}}
-       label]
-      (when sub-label
+        {:style style/text-container}
        [text/text
-         {:size  :paragraph-2
-          :style {:color
-                  (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
-         sub-label])]
-     (when (or right-text right-icon (= state :selected))
-       [rn/view {:style style/right-side-container}
-        (when right-text
+         {:size   :paragraph-1
+          :weight :medium
+          :style  {:color
+                   (cond
+                     danger? (colors/theme-colors colors/danger-50 colors/danger-60 theme)
+                     :else   (colors/theme-colors colors/neutral-100 colors/white theme))}}
+         label]
+        (when sub-label
          [text/text
-           {:accessibility-label :right-text-for-action
-            :size                :paragraph-1
-            :style               (style/right-text theme)}
-           right-text])
-        (when right-icon
-          [rn/view
-           {:style               style/right-icon
-            :accessible          true
-            :accessibility-label :right-icon-for-action}
-           [icon/icon right-icon
-            {:color (get-icon-color danger? theme)
-             :size  20}]])
-        (when (= state :selected)
-          [rn/view {:style style/right-icon}
-           [icon/icon :i/check
-            {:color (if blur?
-                      colors/white
-                      (colors/resolve-color customization-color theme))
-             :size  20}]])])]]])
-
-(def ^:private action (quo.theme/with-theme action-internal))
+           {:size  :paragraph-2
+            :style {:color
+                    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
+           sub-label])]
+       (when (or right-text right-icon (= state :selected))
+         [rn/view {:style style/right-side-container}
+          (when right-text
+            [text/text
+             {:accessibility-label :right-text-for-action
+              :size                :paragraph-1
+              :style               (style/right-text theme)}
+             right-text])
+          (when right-icon
+            [rn/view
+             {:style               style/right-icon
+              :accessible          true
+              :accessibility-label :right-icon-for-action}
+             [icon/icon right-icon
+              {:color (get-icon-color danger? theme)
+               :size  20}]])
+          (when (= state :selected)
+            [rn/view {:style style/right-icon}
+             [icon/icon :i/check
+              {:color (if blur?
+                        colors/white
+                        (colors/resolve-color customization-color theme))
+               :size  20}]])])]]]))

 (defn action-drawer
  [sections]
@@ -26,7 +26,6 @@
      [:button-two-label {:optional true} [:maybe :string]]
      [:button-one-props {:optional true} [:maybe :map]]
      [:button-two-props {:optional true} [:maybe :map]]
-      [:theme :schema.common/theme]
      [:scroll? {:optional true} [:maybe :boolean]]
      [:blur? {:optional true} [:maybe :boolean]]
      [:container-style {:optional true} [:maybe :map]]]]]
@@ -40,58 +39,57 @@

 (defn- view-internal
  [{:keys [actions description description-text description-top-text error-message role button-one-label
-           button-two-label blur? button-one-props button-two-props theme scroll? container-style]}]
-  [rn/view
-   {:style (merge (style/container scroll? blur? theme) container-style)}
-   (when (= description :top-error)
-     [rn/view {:style style/error-message}
-      [icon/icon
-       :i/alert
-       {:color (colors/theme-colors colors/danger-50 colors/danger-60 theme)
-        :size  16}]
-      [text/text
-       {:size  :paragraph-2
-        :style {:color (colors/theme-colors colors/danger-50 colors/danger-60 theme)}}
-       error-message]])
+           button-two-label blur? button-one-props button-two-props scroll? container-style]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:style (merge (style/container scroll? blur? theme) container-style)}
+     (when (= description :top-error)
+       [rn/view {:style style/error-message}
+        [icon/icon
+         :i/alert
+         {:color (colors/theme-colors colors/danger-50 colors/danger-60 theme)
+          :size  16}]
+        [text/text
+         {:size  :paragraph-2
+          :style {:color (colors/theme-colors colors/danger-50 colors/danger-60 theme)}}
+         error-message]])

-   (when (and (= description :top) role)
-     [rn/view {:style style/description-top}
-      [text/text
-       {:size  :paragraph-2
-        :style (style/description-top-text scroll? blur? theme)}
-       (or description-top-text (i18n/label :t/eligible-to-join-as))]
-      [context-tag/view
-       {:type    :icon
-        :size    24
-        :icon    (role role-icon)
-        :blur?   blur?
-        :context (i18n/label (keyword "t" role))}]])
+     (when (and (= description :top) role)
+       [rn/view {:style style/description-top}
+        [text/text
+         {:size  :paragraph-2
+          :style (style/description-top-text scroll? blur? theme)}
+         (or description-top-text (i18n/label :t/eligible-to-join-as))]
+        [context-tag/view
+         {:type    :icon
+          :size    24
+          :icon    (role role-icon)
+          :blur?   blur?
+          :context (i18n/label (keyword "t" role))}]])

-   [rn/view {:style style/buttons-container}
-    (when (= actions :two-actions)
+     [rn/view {:style style/buttons-container}
+      (when (= actions :two-actions)
+        [button/button
+         (merge
+          {:size                40
+           :background          (when (or blur? scroll?) :blur)
+           :container-style     style/button-container
+           :theme               theme
+           :accessibility-label :button-two}
+          button-two-props)
+         button-two-label])
      [button/button
       (merge
        {:size                40
-         :background          (when (or blur? scroll?) :blur)
         :container-style     style/button-container
+         :background          (when (or blur? scroll?) :blur)
         :theme               theme
-         :accessibility-label :button-two}
-        button-two-props)
-       button-two-label])
-    [button/button
-     (merge
-      {:size                40
-       :container-style     style/button-container
-       :background          (when (or blur? scroll?) :blur)
-       :theme               theme
-       :accessibility-label :button-one}
-      button-one-props)
-     button-one-label]]
-   (when (= description :bottom)
-     [text/text
-      {:size  :paragraph-2
-       :style (style/description-bottom scroll? blur? theme)} description-text])])
+         :accessibility-label :button-one}
+        button-one-props)
+       button-one-label]]
+     (when (= description :bottom)
+       [text/text
+        {:size  :paragraph-2
+         :style (style/description-bottom scroll? blur? theme)} description-text])]))

-(def view
-  (quo.theme/with-theme
-   (schema/instrument #'view-internal ?schema)))
+(def view (schema/instrument #'view-internal ?schema))
@@ -7,7 +7,7 @@
    [react-native.core :as rn]
    [react-native.gesture :as gesture]))

-(defn- view-internal
+(defn view
  "Options
   - `title` Title text
   - `show-button?` Show button
@@ -17,29 +17,28 @@
   - `shell?` use shell theme
   `content` Content of the drawer
   "
-  [{:keys [title show-button? on-press-button button-label button-icon theme shell?]} content]
-  [gesture/scroll-view
-   {:style                             style/outer-container
-    :always-bounce-vertical            false
-    :content-inset-adjustment-behavior :never}
-   [rn/view {:style style/container}
-    [text/text
-     {:size                :heading-2
-      :accessibility-label :documentation-drawer-title
-      :style               (style/title theme)
-      :weight              :semi-bold}
-     title]
-    [rn/view {:style style/content :accessibility-label :documentation-drawer-content}
-     content
-     (when show-button?
-       [button/button
-        {:size                24
-         :type                :outline
-         :container-style     {:margin-top 16}
-         :background          (when shell? :blur)
-         :on-press            on-press-button
-         :accessibility-label :documentation-drawer-button
-         :icon-right          button-icon}
-        button-label])]]])
-
-(def view (quo.theme/with-theme view-internal))
+  [{:keys [title show-button? on-press-button button-label button-icon shell?]} content]
+  (let [theme (quo.theme/use-theme)]
+    [gesture/scroll-view
+     {:style                             style/outer-container
+      :always-bounce-vertical            false
+      :content-inset-adjustment-behavior :never}
+     [rn/view {:style style/container}
+      [text/text
+       {:size                :heading-2
+        :accessibility-label :documentation-drawer-title
+        :style               (style/title theme)
+        :weight              :semi-bold}
+       title]
+      [rn/view {:style style/content :accessibility-label :documentation-drawer-content}
+       content
+       (when show-button?
+         [button/button
+          {:size                24
+           :type                :outline
+           :container-style     {:margin-top 16}
+           :background          (when shell? :blur)
+           :on-press            on-press-button
+           :accessibility-label :documentation-drawer-button
+           :icon-right          button-icon}
+          button-label])]]]))
@@ -5,7 +5,7 @@
    [quo.components.icon :as icon]
    [quo.components.markdown.text :as text]
    [quo.components.selectors.selectors.view :as selectors]
-    [quo.theme :as theme]
+    [quo.theme]
    [react-native.core :as rn]
    [schema.core :as schema]))

@@ -14,7 +14,7 @@
           customization-color blur?]
    :or   {customization-color :blue
           blur?               false}}]
-  (let [theme                  (theme/use-theme-value)
+  (let [theme                  (quo.theme/use-theme)
        [pressed? set-pressed] (rn/use-state false)
        on-press-in            (rn/use-callback #(set-pressed true))
        on-press-out           (rn/use-callback #(set-pressed false))]
@@ -192,54 +192,50 @@
                            colors/white-opa-40
                            (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}])]))

-(defn- view-internal
-  [{:keys [title title-icon type theme description blur? community-name community-logo button-icon
-           account-name emoji context-tag-type button-type
-           on-button-press
-           on-button-long-press
-           button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar
-           profile-picture keycard? networks label full-name
-           container-style]}]
-  [rn/view {:style (merge style/container container-style)}
-   (when (left-image-supported-types type)
-     [rn/view {:style style/left-container}
-      [left-image
-       {:type                 type
-        :customization-color  customization-color
-        :account-avatar-emoji account-avatar-emoji
-        :account-avatar-type  account-avatar-type
-        :icon-avatar          icon-avatar
-        :profile-picture      profile-picture}]])
-   [rn/view {:style style/body-container}
-    [left-title
-     {:type       type
-      :label      label
-      :title      title
-      :title-icon title-icon
-      :theme      theme
-      :blur?      blur?}]
-    [subtitle
-     {:type                type
-      :theme               theme
-      :blur?               blur?
-      :keycard?            keycard?
-      :networks            networks
-      :description         description
-      :community-name      community-name
-      :community-logo      community-logo
-      :context-tag-type    context-tag-type
-      :customization-color customization-color
-      :account-name        account-name
-      :emoji               emoji
-      :full-name           full-name
-      :profile-picture     profile-picture}]]
-   [right-icon
-    {:theme                theme
-     :type                 type
-     :button-type          button-type
-     :on-button-press      on-button-press
-     :on-button-long-press on-button-long-press
-     :button-disabled?     button-disabled?
-     :button-icon          button-icon}]])
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [title title-icon type description blur? community-name community-logo button-icon
+           account-name emoji context-tag-type button-type container-style
+           on-button-press on-button-long-press profile-picture keycard? networks label full-name
+           button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style (merge style/container container-style)}
+     (when (left-image-supported-types type)
+       [rn/view {:style style/left-container}
+        [left-image
+         {:type                 type
+          :customization-color  customization-color
+          :account-avatar-emoji account-avatar-emoji
+          :account-avatar-type  account-avatar-type
+          :icon-avatar          icon-avatar
+          :profile-picture      profile-picture}]])
+     [rn/view {:style style/body-container}
+      [left-title
+       {:type       type
+        :label      label
+        :title      title
+        :title-icon title-icon
+        :theme      theme
+        :blur?      blur?}]
+      [subtitle
+       {:type                type
+        :theme               theme
+        :blur?               blur?
+        :keycard?            keycard?
+        :networks            networks
+        :description         description
+        :community-name      community-name
+        :community-logo      community-logo
+        :context-tag-type    context-tag-type
+        :customization-color customization-color
+        :account-name        account-name
+        :emoji               emoji
+        :full-name           full-name
+        :profile-picture     profile-picture}]]
+     [right-icon
+      {:theme                theme
+       :type                 type
+       :button-type          button-type
+       :on-button-press      on-button-press
+       :on-button-long-press on-button-long-press
+       :button-disabled?     button-disabled?
+       :button-icon          button-icon}]]))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander	916c0b995c	Merge branch 'develop' into reg-event-fx-update	2024-04-22 23:23:07 +02:00
Siddarth Kumar	9b2f6147b6	upgrade react-native-permissions library to 4.1.5 (#19695 ) ## Summary This commit upgrades `react-native-permissions` library to latest version 4.1.5 needed for : https://github.com/status-im/status-mobile/issues/18138 ## Review & Test notes Please test permissions related flows on onboarding, selecting images, notifications and any other areas you can think of. ## Platforms - iOS - Android status: ready	2024-04-22 18:01:45 +02:00
Alexander	4d018a32d4	Merge branch 'develop' into reg-event-fx-update	2024-04-22 17:33:30 +02:00
Yevheniia Berdnyk	5c801331af	e2e: false failure fixes 22.04	2024-04-22 18:04:46 +03:00
Parvesh Monu	96b09eb862	UI in the upper section of the chat differs from the lower section (#19679 )	2024-04-22 20:29:29 +05:30
Mohamed Javid	e104a9a935	[Fix] Keypair name in account about tab (#19505 ) This commit fixes the display of the correct keypair name (where the account is generated from) in the About tab. Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-04-22 19:48:01 +05:30
Yevheniia Berdnyk	34930a7136	e2e: fix for reruning tests	2024-04-22 15:22:18 +03:00
Parvesh Monu	e6f8df9a52	fix channel header is broken when opening channel with chat history after joining the community (#19677 )	2024-04-22 16:13:48 +05:30
jakub	f873dfcde0	fix: location of logs generated by fastlane Currently paths looks wrong like this: ``` .../ios/ios/logs/StatusIm-StatusIm.log ``` Which is wrong because it means CI does not save the file. Signed-off-by: Jakub Sokołowski <jakub@status.im>	2024-04-22 10:07:06 +02:00
Ajay Sivan	8034167750	Update status-go version to v0.179.7 (#19675 )	2024-04-19 09:49:03 -07:00
flexsurfer	702899a9cf	remove old bottom sheet (#19689 )	2024-04-19 16:17:06 +02:00
Siddarth Kumar	59f536c479	upgrade blur lib to 4.4.0 (#19681 ) ## Summary This commit swaps the fork of @react-native-community/blur with a patch and upgrades the library to latest version of 4.4.0 needed for : https://github.com/status-im/status-mobile/issues/18138 ## Review & Test notes Verify if blur stuff still works. ## Platforms - iOS - Android status: ready	2024-04-19 15:03:12 +02:00
Alexander	cce91abad0	Merge branch 'develop' into reg-event-fx-update	2024-04-19 12:46:02 +02:00
Ibrahem Khalil	8353c65602	[19576] Fix group avatar not showing group picture (#19723 )	2024-04-19 12:24:03 +02:00
Alexander	c54f291945	Merge branch 'develop' into reg-event-fx-update	2024-04-19 11:30:18 +02:00
alwx	d379d80df4	Lint fix	2024-04-19 11:19:57 +02:00
alwx	702da7a318	Profile handlers	2024-04-19 11:08:38 +02:00
Omar Basem	1f967c6aa1	Fix: category settings item separator line color Fix: category settings item separator line color	2024-04-19 12:48:25 +04:00
Sean Hagstrom	ca53bf7388	Remove Identity Verification tab in Activity Center (#19667 ) * tweak: hide the identity verification tab inside the activity center * tweak: hide not-implemented features by default in dev * fix: remove nil tabs from when rendering quo tabs	2024-04-19 10:01:02 +02:00
Omar Basem	2e2104d4d1	fix: `backup-recovery-phrase` check item pressability (#19705 ) fix: `backup-recovery-phrase` check item pressability (#19705)	2024-04-18 21:33:56 +04:00
Siddarth Kumar	ac48fbef44	bump go to 1.20 (#19564 ) ## Summary This commit also points to status-go branch where we have upgraded go to 1.20 Related status-go PR -> https://github.com/status-im/status-go/pull/5027 ### Testing notes Please test everything, specially the store node stuff. #### Platforms - Android - iOS status: ready	2024-04-18 19:09:55 +02:00
MohsenandYevheniia Berdnyk	8f67f38de9	[#19182 ] fix: shell share design feedback (#19617 ) Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com>	2024-04-18 18:12:29 +03:00
alwx	5a6ae261ed	More bits of it	2024-04-18 16:46:59 +02:00
Churikova Tetiana	ea4578b3e0	pipleine: update doc	2024-04-18 15:31:47 +01:00
flexsurfer	2b40a4d0c4	Feature/remove reagent atom from theme (#19706 )	2024-04-18 16:14:17 +02:00
alwx	1bbfd2222e	Events updates	2024-04-18 16:11:43 +02:00
Brian Sztamfater	17afff272e	fix: fix fees calculation and add support for L1 fees for Optimism transactions (#19603 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-04-18 10:35:18 -03:00
Brian Sztamfater	3526355e23	fix: page top is rendering empty avatar icon if no avatar props are sent (#19638 )	2024-04-18 09:48:42 -03:00
Flavio Fraschetti	f708cdcf50	Feature flag descoped features from MVP to streamline initial release (#19690 ) Feature flag descoped features from MVP: - edit derivation path - wallet/send/contacts	2024-04-18 07:44:32 -03:00
alwx	f04f138f93	`reg-event-fx` update	2024-04-18 12:33:02 +02:00
mmilad75	3af4384e00	Wallet (collectibles) - integrate new Collectible list item component into designs #19140 (#19528 )	2024-04-18 13:54:28 +03:30
Siddarth Kumar	a6b19c021f	swap react-native-mail fork with patch (#19688 ) ## Summary This commit swaps the fork of react-native-mail with a patch. needed for : https://github.com/status-im/status-mobile/issues/18138 ## Review & Test notes Verify if mailing logs still works. ## Platforms - iOS - Android status: ready	2024-04-18 10:59:54 +02:00
Sean Hagstrom	a258717e83	chore: update status-go version for account-saving fixes (#19612 )	2024-04-18 10:37:11 +02:00
Yevheniia Berdnyk	a8395e51a4	e2e: GH report: rerun tests link update	2024-04-18 05:41:36 +03:00
codemaster	db501b5efd	fix: missing author info in reply messages (#19563 )	2024-04-17 15:53:23 -07:00
Siddarth Kumar	44732e9736	upgrade camera-roll lib to 7.5.2 (#19664 ) This commit swaps the fork of @react-native-camera-roll/camera-roll with a patch and upgrades this library to the latest version. needed for : https://github.com/status-im/status-mobile/issues/18138 Verify if camera album related features still work. - iOS status: ready	2024-04-17 17:14:18 +02:00
Brian Sztamfater	d12c05aab6	fix: add external icon to OpenSea button in collectible page (#19647 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-04-17 11:58:27 -03:00
Siddarth Kumar	4134d18cbc	nuke unused lib rn-snoopy (#19691 ) ## Summary We don't use `rn-snoopy` anymore and this commit nukes it.	2024-04-17 15:27:00 +02:00