Merge pull request #370 from tooot-app/main

Release v4.2

android/app/build.gradle

@@ -172,7 +172,7 @@ android {
         }
         manifestPlaceholders = [
             runtimeVersion: project.hasProperty('runtimeVersion') ? project.property('runtimeVersion') : "",
-            releaseChannel: project.hasProperty('releaseChannel') ? project.property('releaseChannel') : "default"
+            branch: project.hasProperty('branch') ? project.property('branch') : "development"
         ]
     }
     if (isNewArchitectureEnabled()) {

android/app/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
     <!-- [Custom] End Expo Notifications -->
     <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://u.expo.dev/3288313f-3ff0-496a-a5a9-d8985e7cad5f"/>
     <meta-data android:name="expo.modules.updates.EXPO_RUNTIME_VERSION" android:value="${runtimeVersion}"/>
-    <meta-data android:name="expo.modules.updates.EXPO_RELEASE_CHANNEL" android:value="${releaseChannel}"/>
+    <meta-data android:name="expo.modules.updates.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY" android:value="{'expo-channel-name':'${branch}'}"/>
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="WIFI_ONLY"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>

fastlane/Fastfile

@@ -32,7 +32,7 @@ private_lane :build_ios do
   DSYM_FILE = "#{BUILD_DIRECTORY}/tooot.app.dSYM.zip"
 
   set_info_plist_value( path: EXPO_PLIST, key: "EXUpdatesRuntimeVersion", value: VERSION )
-  set_info_plist_value( path: EXPO_PLIST, key: "EXUpdatesReleaseChannel", value: ENVIRONMENT )
+  set_info_plist_value( path: EXPO_PLIST, key: "EXUpdatesRequestHeaders", subkey: "expo-channel-name", value: ENVIRONMENT )
 
   setup_ci
   set_info_plist_value( path: INFO_PLIST, key: "CFBundleShortVersionString", value: VERSION )
@@ -98,7 +98,7 @@ private_lane :build_android do
     print_command_output: true,
     properties: {
       "runtimeVersion" => VERSION,
-      "releaseChannel" => ENVIRONMENT,
+      "branch" => ENVIRONMENT,
       "android.injected.signing.store.file" => "#{File.expand_path('..', Dir.pwd)}/android/tooot.jks",
       "android.injected.signing.store.password" => ENV["ANDROID_KEYSTORE_PASSWORD"],
       "android.injected.signing.key.alias" => ENV["ANDROID_KEYSTORE_ALIAS"],
@@ -137,7 +137,7 @@ private_lane :build_android_apk do
     print_command_output: true,
     properties: {
       "runtimeVersion" => VERSION,
-      "releaseChannel" => ENVIRONMENT,
+      "branch" => ENVIRONMENT,
       "android.injected.signing.store.file" => "#{File.expand_path('..', Dir.pwd)}/android/tooot.jks",
       "android.injected.signing.store.password" => ENV["ANDROID_KEYSTORE_PASSWORD"],
       "android.injected.signing.key.alias" => ENV["ANDROID_KEYSTORE_ALIAS"],

ios/tooot/Supporting/Expo.plist

@@ -8,8 +8,11 @@
     <true/>
     <key>EXUpdatesLaunchWaitMs</key>
     <integer>0</integer>
-    <key>EXUpdatesReleaseChannel</key>
-    <string>development</string>
+    <key>EXUpdatesRequestHeaders</key>
+    <dict>
+      <key>expo-channel-name</key>
+      <string>development</string>
+    </dict>
     <key>EXUpdatesRuntimeVersion</key>
     <string>0</string>
     <key>EXUpdatesURL</key>

src/components/Timeline/Shared/HeaderNotification.android.tsx

@@ -32,25 +32,25 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
   const shareOnPress =
     status && status?.visibility !== 'direct'
       ? contextMenuShare({
-          actions: contextMenuActions,
-          type: 'status',
-          url: status.url || status.uri
-        })
+        actions: contextMenuActions,
+        type: 'status',
+        url: status.url || status.uri
+      })
       : null
-  const statusOnPress = contextMenuStatus({
+  const statusOnPress = status && contextMenuStatus({
     actions: contextMenuActions,
-    status: status!,
+    status: status,
     queryKey
   })
-  const accountOnPress = contextMenuAccount({
+  const accountOnPress = status && contextMenuAccount({
     actions: contextMenuActions,
     type: 'status',
     queryKey,
-    id: status!.account.id
+    id: status.account.id
   })
-  const instanceOnPress = contextMenuInstance({
+  const instanceOnPress = status && contextMenuInstance({
     actions: contextMenuActions,
-    status: status!,
+    status: status,
     queryKey
   })
 
@@ -106,7 +106,7 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
         style={{
           flex:
             notification.type === 'follow' ||
-            notification.type === 'follow_request'
+              notification.type === 'follow_request'
               ? 1
               : 4
         }}
@@ -150,7 +150,7 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
         style={[
           { marginLeft: StyleConstants.Spacing.M },
           notification.type === 'follow' ||
-          notification.type === 'follow_request'
+            notification.type === 'follow_request'
             ? { flexShrink: 1 }
             : { flex: 1 }
         ]}

src/utils/checkEnvironment.ts

@@ -36,14 +36,14 @@ const mapEnvironment = <T = unknown>({
 
 const isDevelopment =
   __DEV__ ||
-  ['development'].some(channel => (Updates.channel || Updates.releaseChannel) === channel)
+  ['development'].some(channel => (Updates.channel) === channel)
 
 const isCandidate = ['candidate'].some(channel =>
-  (Updates.channel || Updates.releaseChannel) === channel
+  (Updates.channel) === channel
 )
 
 const isRelease = ['release'].some(channel =>
-  (Updates.channel || Updates.releaseChannel) === channel
+  (Updates.channel) === channel
 )
 
 export { mapEnvironment, isDevelopment, isCandidate, isRelease }