more fixes

.github/workflows/build-submit-android.yml

@@ -60,11 +60,12 @@ jobs:
 
       - name: ✏️ Write environment variables
         run: |
-          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "$json" > google-services.json
+          cp google-services.json.example google-services.json
+#          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
+#          echo "${{ secrets.ENV_TOKEN }}" > .env
+#          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
+#          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
+#          echo "$json" > google-services.json
 
       - name: 🏗️ EAS Build
         run: yarn use-build-number-with-bump eas build -p android --profile ${{ inputs.profile || 'testflight-android' }} --local --output build.aab --non-interactive

app.config.js

@@ -143,7 +143,7 @@ module.exports = function (config) {
           backgroundColor: '#1185FE',
         },
         googleServicesFile: './google-services.json',
-        package: 'xyz.blueskyweb.app',
+        package: 'xyz.blueskyweb.app.fabric',
         intentFilters: [
           {
             action: 'VIEW',
@@ -201,14 +201,14 @@ module.exports = function (config) {
           {
             ios: {
               deploymentTarget: '15.1',
-              newArchEnabled: false,
+              newArchEnabled: true,
             },
             android: {
               compileSdkVersion: 34,
               targetSdkVersion: 34,
               buildToolsVersion: '34.0.0',
-              kotlinVersion: '1.8.0',
-              newArchEnabled: false,
+              kotlinVersion: '1.9.24',
+              newArchEnabled: true,
             },
           },
         ],

eas.json

@@ -80,7 +80,7 @@
         "autoIncrement": true
       },
       "android": {
-        "autoIncrement": true
+        "autoIncrement": false
       },
       "channel": "testflight",
       "env": {

google-services.json.example

@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063",
         "android_client_info": {
-          "package_name": "xyz.blueskyweb.app"
+          "package_name": "xyz.blueskyweb.app.fabric"
         }
       },
       "oauth_client": [

modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt

@@ -246,6 +246,8 @@ class BottomSheetView(
   // Util
 
   private fun getContentHeight(): Float {
+    return this.height.toFloat()
+
     val innerView = this.innerView ?: return 0f
     var index = 0
     innerView.allViews.forEach {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsky.app",
-  "version": "1.91.2",
+  "version": "1.92.0-na-rc.2",
   "private": true,
   "engines": {
     "node": ">=18"
@@ -70,17 +70,17 @@
     "@fortawesome/react-native-fontawesome": "^0.3.2",
     "@haileyok/bluesky-video": "0.1.10",
     "@lingui/react": "^4.5.0",
-    "@mattermost/react-native-paste-input": "^0.7.1",
+    "@haileyok/react-native-paste-input": "^0.8.1-rc.6",
     "@miblanchard/react-native-slider": "^2.3.1",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@react-native-async-storage/async-storage": "1.23.1",
-    "@react-native-masked-view/masked-view": "0.3.0",
+    "@react-native-masked-view/masked-view": "0.3.1",
     "@react-native-menu/menu": "^1.1.0",
-    "@react-native-picker/picker": "2.6.1",
-    "@react-navigation/bottom-tabs": "^6.5.20",
-    "@react-navigation/drawer": "^6.6.15",
-    "@react-navigation/native": "^6.1.17",
-    "@react-navigation/native-stack": "^6.9.26",
+    "@react-native-picker/picker": "2.8.0",
+    "@react-navigation/bottom-tabs": "^6.6.1",
+    "@react-navigation/drawer": "^6.7.2",
+    "@react-navigation/native": "^6.1.18",
+    "@react-navigation/native-stack": "^6.11.0",
     "@sentry/react-native": "5.24.3",
     "@tamagui/focus-scope": "^1.84.1",
     "@tanstack/query-async-storage-persister": "^5.25.0",
@@ -114,32 +114,34 @@
     "emoji-mart": "^5.5.2",
     "emoji-regex": "^10.4.0",
     "eventemitter3": "^5.0.1",
-    "expo": "^51.0.8",
-    "expo-application": "^5.9.1",
-    "expo-blur": "^13.0.2",
-    "expo-build-properties": "^0.12.1",
-    "expo-camera": "~15.0.9",
-    "expo-clipboard": "^6.0.3",
-    "expo-dev-client": "^4.0.14",
-    "expo-device": "~6.0.2",
-    "expo-file-system": "^17.0.1",
-    "expo-font": "~12.0.10",
-    "expo-haptics": "^13.0.1",
-    "expo-image": "~1.12.9",
-    "expo-image-manipulator": "^12.0.5",
-    "expo-image-picker": "~15.0.5",
-    "expo-linear-gradient": "^13.0.2",
-    "expo-linking": "^6.3.1",
-    "expo-localization": "~15.0.3",
-    "expo-media-library": "~16.0.3",
-    "expo-navigation-bar": "~3.0.4",
-    "expo-notifications": "~0.28.7",
-    "expo-sharing": "^12.0.1",
-    "expo-splash-screen": "~0.27.4",
-    "expo-status-bar": "~1.12.1",
-    "expo-task-manager": "~11.8.1",
-    "expo-updates": "~0.25.14",
-    "expo-web-browser": "~13.0.3",
+    "expo": "^52.0.0-canary-20240927-ab8a962",
+    "expo-modules-core": "2.0.0-canary-20240927-ab8a962",
+    "expo-application": "^6.0.0-canary-20240927-ab8a962",
+    "expo-blur": "^14.0.0-canary-20240927-ab8a962",
+    "expo-build-properties": "^1.0.0-canary-20240927-ab8a962",
+    "expo-camera": "~16.0.0-canary-20240927-ab8a962",
+    "expo-clipboard": "^7.0.0-canary-20240927-ab8a962",
+    "expo-dev-client": "^5.0.0-canary-20240927-ab8a962",
+    "expo-device": "~7.0.0-canary-20240927-ab8a962",
+    "expo-file-system": "^18.0.0-canary-20240927-ab8a962",
+    "expo-font": "13.0.0-canary-20240927-ab8a962",
+    "expo-haptics": "14.0.0-canary-20240927-ab8a962",
+    "expo-image": "~2.0.0-canary-20240927-ab8a962",
+    "expo-image-manipulator": "^13.0.0-canary-20240927-ab8a962",
+    "expo-image-picker": "~16.0.0-canary-20240927-ab8a962",
+    "expo-linear-gradient": "^14.0.0-canary-20240927-ab8a962",
+    "expo-linking": "^7.0.0-canary-20240927-ab8a962",
+    "expo-localization": "~16.0.0-canary-20240927-ab8a962",
+    "expo-media-library": "~17.0.0-canary-20240927-ab8a962",
+    "expo-navigation-bar": "~3.0.8-canary-20240927-ab8a962",
+    "expo-notifications": "1.0.0-canary-20240927-ab8a962",
+    "expo-sharing": "^13.0.0-canary-20240927-ab8a962",
+    "expo-splash-screen": "~1.0.0-canary-20240927-ab8a962",
+    "expo-status-bar": "~1.12.2-canary-20240927-ab8a962",
+    "expo-system-ui": "~4.0.0-canary-20240927-ab8a962",
+    "expo-task-manager": "~12.0.0-canary-20240927-ab8a962",
+    "expo-updates": "1.0.0-canary-20240927-ab8a962",
+    "expo-web-browser": "14.0.0-canary-20240927-ab8a962",
     "fast-text-encoding": "^1.0.6",
     "history": "^5.3.0",
     "hls.js": "^1.5.11",
@@ -166,32 +168,32 @@
     "react-dom": "^18.2.0",
     "react-image-crop": "^11.0.7",
     "react-keyed-flatten-children": "^3.0.0",
-    "react-native": "0.74.1",
-    "react-native-compressor": "^1.8.24",
+    "react-native": "0.75.4",
+    "react-native-compressor": "^1.9.0",
     "react-native-date-picker": "^4.4.2",
-    "react-native-drawer-layout": "^4.0.0-alpha.3",
+    "react-native-drawer-layout": "^4.0.0-rc.10",
     "react-native-gesture-handler": "2.20.0",
     "react-native-get-random-values": "~1.11.0",
     "react-native-image-crop-picker": "0.41.2",
     "react-native-ios-context-menu": "^1.15.3",
     "react-native-keyboard-controller": "^1.14.0",
-    "react-native-mmkv": "^2.12.2",
-    "react-native-pager-view": "6.2.3",
+    "react-native-mmkv": "3.0.2",
+    "react-native-pager-view": "6.4.1",
     "react-native-picker-select": "^9.1.3",
     "react-native-progress": "bluesky-social/react-native-progress",
-    "react-native-qrcode-styled": "^0.3.1",
-    "react-native-reanimated": "^3.11.0",
-    "react-native-root-siblings": "^4.1.1",
-    "react-native-safe-area-context": "4.10.1",
-    "react-native-screens": "~3.31.1",
-    "react-native-svg": "^15.3.0",
-    "react-native-uitextview": "^1.3.0",
+    "react-native-qrcode-styled": "^0.3.2",
+    "react-native-reanimated": "^3.15.2",
+    "react-native-root-siblings": "^5.0.1",
+    "react-native-safe-area-context": "^4.11.0",
+    "react-native-screens": "~3.35.0-rc.1",
+    "react-native-svg": "^15.6.0",
+    "react-native-uitextview": "2.0.0-rc.0",
     "react-native-url-polyfill": "^1.3.0",
     "react-native-uuid": "^2.0.2",
-    "react-native-view-shot": "^3.8.0",
-    "react-native-web": "~0.19.11",
+    "react-native-view-shot": "^4.0.0-alpha.3",
+    "react-native-web": "~0.19.12",
     "react-native-web-webview": "^1.0.2",
-    "react-native-webview": "13.10.2",
+    "react-native-webview": "13.12.2",
     "react-responsive": "^9.0.2",
     "react-textarea-autosize": "^8.5.3",
     "rn-fetch-blob": "^0.12.0",
@@ -278,7 +280,9 @@
     "**/zod": "3.23.8",
     "**/expo-constants": "16.0.1",
     "**/expo-device": "6.0.2",
-    "@react-native/babel-preset": "0.74.1"
+    "@react-native/babel-preset": "0.74.1",
+    "wrap-ansi": "7.0.0",
+    "string-width": "4.2.3"
   },
   "jest": {
     "preset": "jest-expo/ios",

patches/expo-modules-core+1.12.11.md

@@ -1,5 +0,0 @@
-## expo-modules-core Patch
-
-This patch fixes crashes seen in some Android clients when using intents to open the app. See https://github.com/expo/expo/pull/29513.
-
-Do not remove this patch until that PR lands in Expo and is released.

patches/expo-modules-core+1.12.11.patch

@@ -1,26 +0,0 @@
-diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java b/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java
-index bb74e80..0aa0202 100644
---- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java
-+++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java
-@@ -90,8 +90,8 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
-     mModuleRegistry.ensureIsInitialized();
- 
-     KotlinInteropModuleRegistry kotlinModuleRegistry = getKotlinInteropModuleRegistry();
--    kotlinModuleRegistry.emitOnCreate();
-     kotlinModuleRegistry.installJSIInterop();
-+    kotlinModuleRegistry.emitOnCreate();
- 
-     Map<String, Object> constants = new HashMap<>(3);
-     constants.put(MODULES_CONSTANTS_KEY, new HashMap<>());
-diff --git a/node_modules/expo-modules-core/build/uuid/uuid.js b/node_modules/expo-modules-core/build/uuid/uuid.js
-index 109d3fe..c7fce9e 100644
---- a/node_modules/expo-modules-core/build/uuid/uuid.js
-+++ b/node_modules/expo-modules-core/build/uuid/uuid.js
-@@ -1,5 +1,7 @@
- import bytesToUuid from './lib/bytesToUuid';
- import { Uuidv5Namespace } from './uuid.types';
-+import { ensureNativeModulesAreInstalled } from '../ensureNativeModulesAreInstalled';
-+ensureNativeModulesAreInstalled();
- const nativeUuidv4 = globalThis?.expo?.uuidv4;
- const nativeUuidv5 = globalThis?.expo?.uuidv5;
- function uuidv4() {

patches/react-native+0.74.1.patch

@@ -1,170 +0,0 @@
-diff --git a/node_modules/react-native/Libraries/Blob/RCTFileReaderModule.mm b/node_modules/react-native/Libraries/Blob/RCTFileReaderModule.mm
-index caa5540..c5d4e67 100644
---- a/node_modules/react-native/Libraries/Blob/RCTFileReaderModule.mm
-+++ b/node_modules/react-native/Libraries/Blob/RCTFileReaderModule.mm
-@@ -73,7 +73,7 @@ @implementation RCTFileReaderModule
-     } else {
-       NSString *type = [RCTConvert NSString:blob[@"type"]];
-       NSString *text = [NSString stringWithFormat:@"data:%@;base64,%@",
--                                                  type != nil && [type length] > 0 ? type : @"application/octet-stream",
-+                                                  ![type isEqual:[NSNull null]] && [type length] > 0 ? type : @"application/octet-stream",
-                                                   [data base64EncodedStringWithOptions:0]];
-
-       resolve(text);
-diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
-index b0d71dc..41b9a0e 100644
---- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
-+++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
-@@ -377,10 +377,6 @@ - (void)textInputDidBeginEditing
-     self.backedTextInputView.attributedText = [NSAttributedString new];
-   }
-
--  if (_selectTextOnFocus) {
--    [self.backedTextInputView selectAll:nil];
--  }
--
-   [_eventDispatcher sendTextEventWithType:RCTTextEventTypeFocus
-                                  reactTag:self.reactTag
-                                      text:[self.backedTextInputView.attributedText.string copy]
-@@ -611,6 +607,10 @@ - (UIView *)reactAccessibilityElement
- - (void)reactFocus
- {
-   [self.backedTextInputView reactFocus];
-+
-+  if (_selectTextOnFocus) {
-+    [self.backedTextInputView selectAll:nil];
-+  }
- }
-
- - (void)reactBlur
-diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
-index e9b330f..ec5f58c 100644
---- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
-+++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
-@@ -15,5 +15,8 @@
- @property (nonatomic, copy) NSString *title;
- @property (nonatomic, copy) RCTDirectEventBlock onRefresh;
- @property (nonatomic, weak) UIScrollView *scrollView;
-+@property (nonatomic, copy) UIColor *customTintColor;
-+
-+- (void)forwarderBeginRefreshing;
-
- @end
-diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-index b09e653..288e60c 100644
---- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-+++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-@@ -22,6 +22,7 @@ @implementation RCTRefreshControl {
-   NSString *_title;
-   UIColor *_titleColor;
-   CGFloat _progressViewOffset;
-+  UIColor *_customTintColor;
- }
-
- - (instancetype)init
-@@ -56,6 +57,12 @@ - (void)layoutSubviews
-   _isInitialRender = false;
- }
-
-+- (void)didMoveToSuperview
-+{
-+  [super didMoveToSuperview];
-+  [self setTintColor:_customTintColor];
-+}
-+
- - (void)beginRefreshingProgrammatically
- {
-   UInt64 beginRefreshingTimestamp = _currentRefreshingStateTimestamp;
-@@ -203,4 +210,58 @@ - (void)refreshControlValueChanged
-   }
- }
-
-+- (void)setCustomTintColor:(UIColor *)customTintColor
-+{
-+  _customTintColor = customTintColor;
-+  [self setTintColor:customTintColor];
-+}
-+
-+// Fix for https://github.com/facebook/react-native/issues/43388
-+// A bug in iOS 17.4 causes the haptic to not play when refreshing if the tintColor
-+// is set before the refresh control gets added to the scrollview. We'll call this
-+// function whenever the superview changes. We'll also call it if the value of customTintColor
-+// changes.
-+- (void)setTintColor:(UIColor *)tintColor
-+{
-+  if ([self.superview isKindOfClass:[UIScrollView class]] && self.tintColor != tintColor) {
-+    [super setTintColor:tintColor];
-+  }
-+}
-+
-+/*
-+ This method is used by Bluesky's ExpoScrollForwarder. This allows other React Native
-+ libraries to perform a refresh of a scrollview and access the refresh control's onRefresh
-+ function.
-+ */
-+- (void)forwarderBeginRefreshing
-+{
-+  _refreshingProgrammatically = NO;
-+
-+  [self sizeToFit];
-+
-+  if (!self.scrollView) {
-+    return;
-+  }
-+
-+  UIScrollView *scrollView = (UIScrollView *)self.scrollView;
-+
-+  [UIView animateWithDuration:0.3
-+    delay:0
-+    options:UIViewAnimationOptionBeginFromCurrentState
-+    animations:^(void) {
-+      // Whenever we call this method, the scrollview will always be at a position of
-+      // -130 or less. Scrolling back to -65 simulates the default behavior of RCTRefreshControl
-+      [scrollView setContentOffset:CGPointMake(0, -65)];
-+    }
-+    completion:^(__unused BOOL finished) {
-+      [super beginRefreshing];
-+      [self setCurrentRefreshingState:super.refreshing];
-+
-+      if (self->_onRefresh) {
-+        self->_onRefresh(nil);
-+      }
-+    }
-+  ];
-+}
-+
- @end
-diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
-index 40aaf9c..1c60164 100644
---- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
-+++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
-@@ -22,11 +22,12 @@ - (UIView *)view
-
- RCT_EXPORT_VIEW_PROPERTY(onRefresh, RCTDirectEventBlock)
- RCT_EXPORT_VIEW_PROPERTY(refreshing, BOOL)
--RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
- RCT_EXPORT_VIEW_PROPERTY(title, NSString)
- RCT_EXPORT_VIEW_PROPERTY(titleColor, UIColor)
- RCT_EXPORT_VIEW_PROPERTY(progressViewOffset, CGFloat)
-
-+RCT_REMAP_VIEW_PROPERTY(tintColor, customTintColor, UIColor)
-+
- RCT_EXPORT_METHOD(setNativeRefreshing : (nonnull NSNumber *)viewTag toRefreshing : (BOOL)refreshing)
- {
-   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
-index 5f5e1ab..aac00b6 100644
---- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
-+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
-@@ -99,8 +99,9 @@ public class JavaTimerManager {
-       }
-
-       // If the JS thread is busy for multiple frames we cancel any other pending runnable.
--      if (mCurrentIdleCallbackRunnable != null) {
--        mCurrentIdleCallbackRunnable.cancel();
-+      IdleCallbackRunnable currentRunnable = mCurrentIdleCallbackRunnable;
-+      if (currentRunnable != null) {
-+        currentRunnable.cancel();
-       }
-
-       mCurrentIdleCallbackRunnable = new IdleCallbackRunnable(frameTimeNanos);

patches/react-native+0.74.1.patch.md

@@ -1,20 +0,0 @@
-# ***This second part of this patch is load bearing, do not remove.***
-
-## RefreshControl Patch - iOS 17.4 Haptic Regression
-
-Patching `RCTRefreshControl.mm` temporarily to play an impact haptic on refresh when using iOS 17.4 or higher. Since
-17.4, there has been a regression somewhere causing haptics to not play on iOS on refresh. Should monitor for an update
-in the RN repo: https://github.com/facebook/react-native/issues/43388
-
-## RefreshControl Path - ScrollForwarder
-
-Patching `RCTRefreshControl.m` and `RCTRefreshControl.h` to add a new `forwarderBeginRefreshing` method to the class.
-This method is used by `ExpoScrollForwarder` to initiate a refresh of the underlying `UIScrollView` from inside that
-module.
-
-
-## TextInput Patch - `selectTextOnFocus` fix
-
-Patching `RCTBaseTextInputView.m` to fix an issue where `selectTextOnFocus` does not work as expected on iOS 17. This
-patch _only_ fixes the Paper version of `TextInput`. If we migrate to Fabric and the fix has not been made upstream,
-we can apply the same fix. See https://github.com/facebook/react-native/pull/44307.

patches/react-native-reanimated+3.11.0.patch

@@ -1,209 +0,0 @@
-diff --git a/node_modules/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts b/node_modules/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts
-index 92ebe62..5f8207e 100644
---- a/node_modules/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts
-+++ b/node_modules/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts
-@@ -96,7 +96,8 @@ export interface AnimatedComponentRef extends Component {
- export interface IAnimatedComponentInternal {
-   _styles: StyleProps[] | null;
-   _animatedProps?: Partial<AnimatedComponentProps<AnimatedProps>>;
--  _viewTag: number;
-+  _componentViewTag: number;
-+  _eventViewTag: number;
-   _isFirstRender: boolean;
-   jestAnimatedStyle: { value: StyleProps };
-   _component: AnimatedComponentRef | HTMLElement | null;
-diff --git a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
-index 88b3fdf..2488ebc 100644
---- a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
-+++ b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
-@@ -122,7 +122,8 @@ export function createAnimatedComponent(
-   {
-     _styles: StyleProps[] | null = null;
-     _animatedProps?: Partial<AnimatedComponentProps<AnimatedProps>>;
--    _viewTag = -1;
-+    _componentViewTag = -1;
-+    _eventViewTag = -1;
-     _isFirstRender = true;
-     jestAnimatedStyle: { value: StyleProps } = { value: {} };
-     _component: AnimatedComponentRef | HTMLElement | null = null;
-@@ -143,7 +144,8 @@ export function createAnimatedComponent(
-     }
-
-     componentDidMount() {
--      this._viewTag = this._getViewInfo().viewTag as number;
-+      this._setComponentViewTag();
-+      this._setEventViewTag();
-       this._attachNativeEvents();
-       this._jsPropsUpdater.addOnJSPropsChangeListener(this);
-       this._attachAnimatedStyles();
-@@ -185,7 +187,10 @@ export function createAnimatedComponent(
-       if (this.props.sharedTransitionTag) {
-         this._configureSharedTransition(true);
-       }
--      this._sharedElementTransition?.unregisterTransition(this._viewTag, true);
-+      this._sharedElementTransition?.unregisterTransition(
-+        this._componentViewTag,
-+        true
-+      );
-
-       const exiting = this.props.exiting;
-       if (
-@@ -209,7 +214,7 @@ export function createAnimatedComponent(
-             : getReduceMotionFromConfig();
-         if (!reduceMotionInExiting) {
-           updateLayoutAnimations(
--            this._viewTag,
-+            this._componentViewTag,
-             LayoutAnimationType.EXITING,
-             maybeBuild(
-               exiting,
-@@ -221,12 +226,22 @@ export function createAnimatedComponent(
-       }
-     }
-
--    _getEventViewRef() {
--      // Make sure to get the scrollable node for components that implement
--      // `ScrollResponder.Mixin`.
--      return (this._component as AnimatedComponentRef)?.getScrollableNode
--        ? (this._component as AnimatedComponentRef).getScrollableNode?.()
--        : this._component;
-+    _setComponentViewTag() {
-+      this._componentViewTag = this._getViewInfo().viewTag as number;
-+    }
-+
-+    _setEventViewTag() {
-+      // Setting the tag for registering events - since the event emitting view can be nested inside the main component
-+      const componentAnimatedRef = this._component as AnimatedComponentRef;
-+      if (componentAnimatedRef.getScrollableNode) {
-+        const scrollableNode = componentAnimatedRef.getScrollableNode();
-+        this._eventViewTag = findNodeHandle(scrollableNode) ?? -1;
-+      } else {
-+        this._eventViewTag =
-+          findNodeHandle(
-+            options?.setNativeProps ? this : componentAnimatedRef
-+          ) ?? -1;
-+      }
-     }
-
-     _attachNativeEvents() {
-@@ -236,7 +251,7 @@ export function createAnimatedComponent(
-           has('workletEventHandler', prop) &&
-           prop.workletEventHandler instanceof WorkletEventHandler
-         ) {
--          prop.workletEventHandler.registerForEvents(this._viewTag, key);
-+          prop.workletEventHandler.registerForEvents(this._eventViewTag, key);
-         }
-       }
-     }
-@@ -248,7 +263,7 @@ export function createAnimatedComponent(
-           has('workletEventHandler', prop) &&
-           prop.workletEventHandler instanceof WorkletEventHandler
-         ) {
--          prop.workletEventHandler.unregisterFromEvents(this._viewTag);
-+          prop.workletEventHandler.unregisterFromEvents(this._eventViewTag);
-         }
-       }
-     }
-@@ -258,15 +273,17 @@ export function createAnimatedComponent(
-         for (const style of this._styles) {
-           style.viewsRef.remove(this);
-         }
--      } else if (this._viewTag !== -1 && this._styles !== null) {
-+      } else if (this._componentViewTag !== -1 && this._styles !== null) {
-         for (const style of this._styles) {
--          style.viewDescriptors.remove(this._viewTag);
-+          style.viewDescriptors.remove(this._componentViewTag);
-         }
-         if (this.props.animatedProps?.viewDescriptors) {
--          this.props.animatedProps.viewDescriptors.remove(this._viewTag);
-+          this.props.animatedProps.viewDescriptors.remove(
-+            this._componentViewTag
-+          );
-         }
-         if (isFabric()) {
--          removeFromPropsRegistry(this._viewTag);
-+          removeFromPropsRegistry(this._componentViewTag);
-         }
-       }
-     }
-@@ -283,15 +300,19 @@ export function createAnimatedComponent(
-           const newProp = this.props[key];
-           if (!newProp) {
-             // Prop got deleted
--            prevProp.workletEventHandler.unregisterFromEvents(this._viewTag);
-+            prevProp.workletEventHandler.unregisterFromEvents(
-+              this._eventViewTag
-+            );
-           } else if (
-             has('workletEventHandler', newProp) &&
-             newProp.workletEventHandler instanceof WorkletEventHandler &&
-             newProp.workletEventHandler !== prevProp.workletEventHandler
-           ) {
-             // Prop got changed
--            prevProp.workletEventHandler.unregisterFromEvents(this._viewTag);
--            newProp.workletEventHandler.registerForEvents(this._viewTag);
-+            prevProp.workletEventHandler.unregisterFromEvents(
-+              this._eventViewTag
-+            );
-+            newProp.workletEventHandler.registerForEvents(this._eventViewTag);
-           }
-         }
-       }
-@@ -304,7 +325,7 @@ export function createAnimatedComponent(
-           !prevProps[key]
-         ) {
-           // Prop got added
--          newProp.workletEventHandler.registerForEvents(this._viewTag);
-+          newProp.workletEventHandler.registerForEvents(this._eventViewTag);
-         }
-       }
-     }
-@@ -381,7 +402,7 @@ export function createAnimatedComponent(
-         adaptViewConfig(viewConfig);
-       }
-
--      this._viewTag = viewTag as number;
-+      this._componentViewTag = viewTag as number;
-
-       // remove old styles
-       if (prevStyles) {
-@@ -487,7 +508,11 @@ export function createAnimatedComponent(
-             AnimatedComponent.displayName
-           )
-         : undefined;
--      updateLayoutAnimations(this._viewTag, LayoutAnimationType.LAYOUT, layout);
-+      updateLayoutAnimations(
-+        this._componentViewTag,
-+        LayoutAnimationType.LAYOUT,
-+        layout
-+      );
-     }
-
-     _configureSharedTransition(isUnmounting = false) {
-@@ -497,7 +522,7 @@ export function createAnimatedComponent(
-       const { sharedTransitionTag } = this.props;
-       if (!sharedTransitionTag) {
-         this._sharedElementTransition?.unregisterTransition(
--          this._viewTag,
-+          this._componentViewTag,
-           isUnmounting
-         );
-         this._sharedElementTransition = null;
-@@ -508,7 +533,7 @@ export function createAnimatedComponent(
-         this._sharedElementTransition ??
-         new SharedTransition();
-       sharedElementTransition.registerTransition(
--        this._viewTag,
-+        this._componentViewTag,
-         sharedTransitionTag,
-         isUnmounting
-       );
-@@ -527,7 +552,7 @@ export function createAnimatedComponent(
-           ? (ref as HTMLElement)
-           : findNodeHandle(ref as Component);
-
--        this._viewTag = tag as number;
-+        this._componentViewTag = tag as number;
-
-         const { layout, entering, exiting, sharedTransitionTag } = this.props;
-         if (

src/App.native.tsx

@@ -10,7 +10,7 @@ import {
   initialWindowMetrics,
   SafeAreaProvider,
 } from 'react-native-safe-area-context'
-import * as SplashScreen from 'expo-splash-screen'
+// import * as SplashScreen from 'expo-splash-screen'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
@@ -66,10 +66,10 @@ import {NuxDialogs} from '#/components/dialogs/nuxs'
 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
 import {Provider as PortalProvider} from '#/components/Portal'
-import {Splash} from '#/Splash'
+// import {Splash} from '#/Splash'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
 
-SplashScreen.preventAutoHideAsync()
+// SplashScreen.preventAutoHideAsync()
 
 /**
  * Begin geolocation ASAP
@@ -77,14 +77,14 @@ SplashScreen.preventAutoHideAsync()
 beginResolveGeolocation()
 
 function InnerApp() {
-  const [isReady, setIsReady] = React.useState(false)
+  const [_isReady, setIsReady] = React.useState(false)
   const {currentAccount} = useSession()
   const {resumeSession} = useSessionApi()
   const theme = useColorModeTheme()
   const {_} = useLingui()
 
   useIntentHandler()
-  const hasCheckedReferrer = useStarterPackEntry()
+  useStarterPackEntry()
 
   // init
   useEffect(() => {
@@ -118,47 +118,46 @@ function InnerApp() {
   return (
     <Alf theme={theme}>
       <ThemeProvider theme={theme}>
-        <Splash isReady={isReady && hasCheckedReferrer}>
-          <RootSiblingParent>
-            <VideoVolumeProvider>
-              <React.Fragment
-                // Resets the entire tree below when it changes:
-                key={currentAccount?.did}>
-                <QueryProvider currentDid={currentAccount?.did}>
-                  <StatsigProvider>
-                    <MessagesProvider>
-                      {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
-                      <LabelDefsProvider>
-                        <ModerationOptsProvider>
-                          <LoggedOutViewProvider>
-                            <SelectedFeedProvider>
-                              <HiddenRepliesProvider>
-                                <UnreadNotifsProvider>
-                                  <BackgroundNotificationPreferencesProvider>
-                                    <MutedThreadsProvider>
-                                      <ProgressGuideProvider>
-                                        <GestureHandlerRootView
-                                          style={s.h100pct}>
-                                          <TestCtrls />
-                                          <Shell />
-                                          <NuxDialogs />
-                                        </GestureHandlerRootView>
-                                      </ProgressGuideProvider>
-                                    </MutedThreadsProvider>
-                                  </BackgroundNotificationPreferencesProvider>
-                                </UnreadNotifsProvider>
-                              </HiddenRepliesProvider>
-                            </SelectedFeedProvider>
-                          </LoggedOutViewProvider>
-                        </ModerationOptsProvider>
-                      </LabelDefsProvider>
-                    </MessagesProvider>
-                  </StatsigProvider>
-                </QueryProvider>
-              </React.Fragment>
-            </VideoVolumeProvider>
-          </RootSiblingParent>
-        </Splash>
+        {/*<Splash isReady={isReady && hasCheckedReferrer}>*/}
+        <RootSiblingParent>
+          <VideoVolumeProvider>
+            <React.Fragment
+              // Resets the entire tree below when it changes:
+              key={currentAccount?.did}>
+              <QueryProvider currentDid={currentAccount?.did}>
+                <StatsigProvider>
+                  <MessagesProvider>
+                    {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
+                    <LabelDefsProvider>
+                      <ModerationOptsProvider>
+                        <LoggedOutViewProvider>
+                          <SelectedFeedProvider>
+                            <HiddenRepliesProvider>
+                              <UnreadNotifsProvider>
+                                <BackgroundNotificationPreferencesProvider>
+                                  <MutedThreadsProvider>
+                                    <ProgressGuideProvider>
+                                      <GestureHandlerRootView style={s.h100pct}>
+                                        <TestCtrls />
+                                        <Shell />
+                                        <NuxDialogs />
+                                      </GestureHandlerRootView>
+                                    </ProgressGuideProvider>
+                                  </MutedThreadsProvider>
+                                </BackgroundNotificationPreferencesProvider>
+                              </UnreadNotifsProvider>
+                            </HiddenRepliesProvider>
+                          </SelectedFeedProvider>
+                        </LoggedOutViewProvider>
+                      </ModerationOptsProvider>
+                    </LabelDefsProvider>
+                  </MessagesProvider>
+                </StatsigProvider>
+              </QueryProvider>
+            </React.Fragment>
+          </VideoVolumeProvider>
+        </RootSiblingParent>
+        {/*</Splash>*/}
       </ThemeProvider>
     </Alf>
   )

src/view/com/composer/text-input/TextInput.tsx

@@ -17,7 +17,7 @@ import {AppBskyRichtextFacet, RichText} from '@atproto/api'
 import PasteInput, {
   PastedFile,
   PasteInputRef,
-} from '@mattermost/react-native-paste-input'
+} from '@haileyok/react-native-paste-input'
 
 import {POST_IMG_MAX} from '#/lib/constants'
 import {downloadAndResize} from '#/lib/media/manip'
@@ -244,12 +244,12 @@ export const TextInput = forwardRef(function TextInputImpl(
         allowFontScaling
         multiline
         scrollEnabled={false}
-        numberOfLines={4}
         style={[
           inputTextStyle,
           a.w_full,
           {textAlignVertical: 'top', minHeight: 60},
         ]}
+        numberOfLines={100}
         {...props}>
         {textDecorated}
       </PasteInput>

src/view/com/util/Link.tsx

@@ -13,20 +13,20 @@ import {
 import {sanitizeUrl} from '@braintree/sanitize-url'
 import {StackActions, useLinkProps} from '@react-navigation/native'
 
-import {useModalControls} from '#/state/modals'
-import {useOpenLink} from '#/state/preferences/in-app-browser'
 import {
   DebouncedNavigationProp,
   useNavigationDeduped,
-} from 'lib/hooks/useNavigationDeduped'
+} from '#/lib/hooks/useNavigationDeduped'
 import {
   convertBskyAppUrlIfNeeded,
   isExternalUrl,
   linkRequiresWarning,
-} from 'lib/strings/url-helpers'
-import {TypographyVariant} from 'lib/ThemeContext'
-import {isAndroid, isWeb} from 'platform/detection'
-import {WebAuxClickWrapper} from 'view/com/util/WebAuxClickWrapper'
+} from '#/lib/strings/url-helpers'
+import {TypographyVariant} from '#/lib/ThemeContext'
+import {isAndroid, isWeb} from '#/platform/detection'
+import {useModalControls} from '#/state/modals'
+import {useOpenLink} from '#/state/preferences/in-app-browser'
+import {WebAuxClickWrapper} from '#/view/com/util/WebAuxClickWrapper'
 import {useTheme} from '#/alf'
 import {router} from '../../../routes'
 import {PressableWithHover} from './PressableWithHover'
@@ -116,7 +116,7 @@ export const Link = memo(function Link({
           android_ripple={{
             color: t.atoms.bg_contrast_25.backgroundColor,
           }}
-          unstable_pressDelay={isAndroid ? 90 : undefined}>
+          unstable_pressDelay={isAndroid ? 20 : undefined}>
           {/* @ts-ignore web only -prf */}
           <View style={style} href={anchorHref}>
             {children ? children : <Text>{title || 'link'}</Text>}