Merge branch 'master' into develop

Minds · Nov 27, 2024 · 182f15d · 182f15d
2 parents 29c352d + 0c2420d
commit 182f15d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/app.constants.js b/app.constants.js
@@ -3,7 +3,7 @@
  * This should be updated after each release
  */
 const CONSTANTS = {
-  APP_VERSION: '5.3.0',
+  APP_VERSION: '5.4.0',
 };
 
 module.exports = CONSTANTS;
diff --git a/src/capture/CaptureFab.tsx b/src/capture/CaptureFab.tsx
@@ -41,7 +41,7 @@ const CaptureFab = ({ navigation, group, testID }: CaptureFabProps) => {
   return (
     <View style={styles.container}>
       <CaptureFabIcon
-        onLongPress={IS_TENANT || group ? undefined : handleComposePress}
+        onLongPress={handleComposePress}
         onPress={IS_TENANT || group ? handleComposePress : pushComposeCreate}
         testID={testID}
       />

diff --git a/src/modules/boost/boost-console/components/v3/Boost.tsx b/src/modules/boost/boost-console/components/v3/Boost.tsx
@@ -60,6 +60,15 @@ const Rejection = ({ boost }: BoostProps) => {
   const wasWrongAudience =
     boost.rejection_reason === BoostRejectionReason.WRONG_AUDIENCE;
 
+  if (!boost?.entity) {
+    return null;
+  }
+
+  let entity: ActivityModel | UserModel =
+    boost.target_location === BoostTargetLocation.newsfeed
+      ? ActivityModel.create(boost.entity)
+      : UserModel.create(boost.entity);
+
   return (
     <Column horizontal="L" bottom="L">
       <B1 font="bold">{t('Reason for rejection')}</B1>
@@ -69,7 +78,7 @@ const Rejection = ({ boost }: BoostProps) => {
           <Link
             onPress={() =>
               navigation?.navigate('BoostScreenV2', {
-                entity: boost.entity,
+                entity: entity,
                 boostType:
                   boost.target_location === BoostTargetLocation.newsfeed
                     ? 'post'