Merge pull request #389 from tooot-app/main

Test build v4.3.2 without OTA
2022-09-21 00:23:56 +02:00 · 2022-09-21 00:23:56 +02:00 · 05a8e87ff2
parent d21afeca53 45caae7083
commit 05a8e87ff2
22 changed files with 39 additions and 232 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -96,17 +96,11 @@ jobs:
        with:
          distribution: 'zulu'
          java-version: '11'
-      - name: -- Step 4 -- Use Expo action
-        uses: expo/expo-github-action@v7
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-      - name: -- Step 5 -- Install node dependencies
+      - name: -- Step 4 -- Install node dependencies
        run: yarn install
-      - name: -- Step 6 -- Install ruby dependencies
+      - name: -- Step 5 -- Install ruby dependencies
        run: bundle install
-      - name: -- Step 7 -- Run fastlane
+      - name: -- Step 6 -- Run fastlane
        env:
          ENVIRONMENT: ${{ steps.branch.outputs.branch }}
          LC_ALL: en_US.UTF-8
@ -118,7 +112,6 @@ jobs:
          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
          ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
          ANDROID_KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_KEY_PASSWORD }}
-          GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}
          FL_GITHUB_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
        run: yarn app:build release
      - name: -- Step 8 -- Publish expo update
--- a/VERSIONING.md
+++ b/VERSIONING.md
@ -1,24 +0,0 @@
-## Major releases - App Store
-
-"Major releases" are artifacts published as `x.?.?`:
-  * An artifact must be released as `x.?.?` if native modules have been changed or updated, including upgrading Expo SDK version.
-  * A new app store version has to be submitted.
-  * Outdated versions in principle do not receive further OTA updates.
-
-## Minor releases - App Store
-
-"Minor releases" are artifacts published as `?.y.?`:
-  * An artifact can be released as `?.y.?` when there is no change nor update made to the native modules.
-  * A new app store version can be submitted for better first launch experience.
-  * All these versions that are not part of above mentioned outdates versions receive also OTA updates.
-
-## Patch releases - OTA
-
-"Patch releases" are artifacts published as `?.?.z`:
-  * An artifact must be release as `?.?.z` when there is no major change to the functionalities.
-  * No new app store version will be submitted.
-  * All these versions that are not part of above mentioned outdates versions receive also OTA updates.
-
-## OTA release channels
-
-  * `MAJOR.MINOR-environment`. Environments include `release`, `candidate` and `development`.
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -170,10 +170,6 @@ android {
                }
            }
        }
-        manifestPlaceholders = [
-            runtimeVersion: project.hasProperty('runtimeVersion') ? project.property('runtimeVersion') : "",
-            branch: project.hasProperty('branch') ? project.property('branch') : "development"
-        ]
    }
    if (isNewArchitectureEnabled()) {
        // We configure the NDK build only if you decide to opt-in for the New Architecture.
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -13,12 +13,6 @@
    <!-- [Custom] Expo Notifications -->
    <meta-data android:name="expo.modules.notifications.default_notification_icon" android:resource="@drawable/ic_stat_notifications" />
    <!-- [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.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"/>
    <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:exported="true" android:theme="@style/Theme.App.SplashScreen" android:screenOrientation="portrait" android:documentLaunchMode="never">
      <intent-filter>
        <action android:name="android.intent.action.MAIN"/>
--- a/android/app/src/main/java/com/xmflsct/app/tooot/MainApplication.java
+++ b/android/app/src/main/java/com/xmflsct/app/tooot/MainApplication.java
@ -16,7 +16,6 @@ import com.facebook.soloader.SoLoader;

 import expo.modules.ApplicationLifecycleDispatcher;
 import expo.modules.ReactNativeHostWrapper;
-import expo.modules.updates.UpdatesController;

 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
--- a/app.config.ts
+++ b/app.config.ts
@ -1,19 +1,14 @@
 import { ExpoConfig } from '@expo/config'
-import { versions } from './package.json'
+import { version } from './package.json'
 import 'dotenv/config'

-const toootVersion = `${versions.major}.${versions.minor}.${versions.patch}`
-
 export default (): ExpoConfig => ({
-  updates: {
-    url: "https://u.expo.dev/3288313f-3ff0-496a-a5a9-d8985e7cad5f"
-  },
-  runtimeVersion: `${versions.major}.${versions.minor}`,
  name: 'tooot',
  description: 'tooot for Mastodon',
  slug: 'tooot',
  scheme: 'tooot',
-  version: toootVersion,
+  version,
+  extra: { environment: process.env.ENVIRONMENT },
  privacy: 'hidden',
  assetBundlePatterns: ['assets/*'],
  hooks: {
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@ -1,19 +1,10 @@
 skip_docs

-VERSIONS = read_json( json_path: "./package.json" )[:versions]
+VERSION = read_json( json_path: "./package.json" )[:version]
+GITHUB_RELEASE = "v#{VERSION}"
 ENVIRONMENT = ENV["ENVIRONMENT"]
-VERSION = "#{VERSIONS[:major]}.#{VERSIONS[:minor]}"
-RELEASE_CHANNEL = "#{VERSIONS[:major]}.#{VERSIONS[:minor]}-#{ENVIRONMENT}"
 BUILD_NUMBER = "#{Time.now.strftime("%y%m%d")}#{ENV["GITHUB_RUN_NUMBER"]}"
 GITHUB_REPO = "tooot-app/app"
-case ENVIRONMENT
-when "candidate"
-  GITHUB_RELEASE = "v#{VERSION}-#{VERSIONS[:patch]}"
-when "release"
-  GITHUB_RELEASE = "v#{VERSION}"
-else
-  GITHUB_RELEASE= ""
-end

 XCODEPROJ = "./ios/tooot.xcodeproj"
 INFO_PLIST = "./ios/tooot/Info.plist"
@ -31,9 +22,6 @@ private_lane :build_ios do
  IPA_FILE = "#{BUILD_DIRECTORY}/tooot.ipa"
  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: "EXUpdatesRequestHeaders", subkey: "expo-channel-name", value: ENVIRONMENT )
-
  setup_ci
  set_info_plist_value( path: INFO_PLIST, key: "CFBundleShortVersionString", value: VERSION )
  set_info_plist_value(
@ -97,8 +85,6 @@ private_lane :build_android do
    print_command: true,
    print_command_output: true,
    properties: {
-      "runtimeVersion" => VERSION,
-      "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"],
@ -136,8 +122,6 @@ private_lane :build_android_apk do
    print_command: true,
    print_command_output: true,
    properties: {
-      "runtimeVersion" => VERSION,
-      "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"],
@ -149,41 +133,26 @@ private_lane :build_android_apk do
 end

 lane :ios do
-  releaseExists = get_github_release(url: GITHUB_REPO, version: "v#{VERSION}", api_bearer: ENV['GH_PAT_GET_RELEASE'])
-  if releaseExists
-    puts("Release #{GITHUB_RELEASE} exists. Continue with building React Native only.")
-  else
-    puts("Release #{GITHUB_RELEASE} does not exist.")
-    cocoapods(clean_install: true, podfile: "./ios/Podfile")
-    build_ios
-  end
+  cocoapods(clean_install: true, podfile: "./ios/Podfile")
+  build_ios
  rocket
 end

 lane :android do
-  releaseExists = get_github_release(url: GITHUB_REPO, version: "v#{VERSION}", api_bearer: ENV['GH_PAT_GET_RELEASE'])
-  if releaseExists
-    puts("Release #{GITHUB_RELEASE} exists. Continue with building React Native only.")
-  else
-    puts("Release #{GITHUB_RELEASE} does not exist. Create new release as well as new native build.")
-    build_android
-  end
+  build_android
  rocket
 end

 lane :release do
-  releaseExists = get_github_release(url: GITHUB_REPO, version: "v#{VERSION}", api_bearer: ENV['GH_PAT_GET_RELEASE'])
-  if !releaseExists
-    build_android_apk
-    set_github_release(
-      repository_name: GITHUB_REPO,
-      name: GITHUB_RELEASE,
-      tag_name: GITHUB_RELEASE,
-      description: "No changelog provided",
-      commitish: git_branch,
-      is_prerelease: ENVIRONMENT == 'candidate',
-      upload_assets: ["#{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk"]
-    )
-  end
+  build_android_apk
+  set_github_release(
+    repository_name: GITHUB_REPO,
+    name: GITHUB_RELEASE,
+    tag_name: GITHUB_RELEASE,
+    description: "No changelog provided",
+    commitish: git_branch,
+    is_prerelease: ENVIRONMENT == 'candidate',
+    upload_assets: ["#{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk"]
+  )
  rocket
 end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -1,9 +1,6 @@
 PODS:
-  - ASN1Decoder (1.8.0)
  - boost (1.76.0)
  - DoubleConversion (1.1.6)
-  - EASClient (0.3.0):
-    - ExpoModulesCore
  - EXApplication (4.2.2):
    - ExpoModulesCore
  - EXAV (12.0.4):
@ -27,9 +24,6 @@ PODS:
    - Firebase/Core (= 8.14.0)
  - EXFont (10.2.0):
    - ExpoModulesCore
-  - EXJSONUtils (0.3.0)
-  - EXManifests (0.3.1):
-    - EXJSONUtils
  - EXNotifications (0.16.1):
    - ExpoModulesCore
  - Expo (46.0.8):
@ -58,16 +52,6 @@ PODS:
    - React-Core
  - EXStoreReview (5.3.0):
    - ExpoModulesCore
-  - EXStructuredHeaders (2.2.1)
-  - EXUpdates (0.14.4):
-    - ASN1Decoder (~> 1.8)
-    - EASClient
-    - EXManifests
-    - ExpoModulesCore
-    - EXStructuredHeaders
-    - EXUpdatesInterface
-    - React-Core
-  - EXUpdatesInterface (0.7.0)
  - EXVideoThumbnails (6.4.0):
    - ExpoModulesCore
  - FBLazyVector (0.69.4)
@ -589,7 +573,6 @@ PODS:
 DEPENDENCIES:
  - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - EASClient (from `../node_modules/expo-eas-client/ios`)
  - EXApplication (from `../node_modules/expo-application/ios`)
  - EXAV (from `../node_modules/expo-av/ios`)
  - EXConstants (from `../node_modules/expo-constants/ios`)
@ -599,8 +582,6 @@ DEPENDENCIES:
  - EXFirebaseAnalytics (from `../node_modules/expo-firebase-analytics/ios`)
  - EXFirebaseCore (from `../node_modules/expo-firebase-core/ios`)
  - EXFont (from `../node_modules/expo-font/ios`)
-  - EXJSONUtils (from `../node_modules/expo-json-utils/ios`)
-  - EXManifests (from `../node_modules/expo-manifests/ios`)
  - EXNotifications (from `../node_modules/expo-notifications/ios`)
  - Expo (from `../node_modules/expo`)
  - ExpoCrypto (from `../node_modules/expo-crypto/ios`)
@ -614,9 +595,6 @@ DEPENDENCIES:
  - EXSecureStore (from `../node_modules/expo-secure-store/ios`)
  - EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
  - EXStoreReview (from `../node_modules/expo-store-review/ios`)
-  - EXStructuredHeaders (from `../node_modules/expo-structured-headers/ios`)
-  - EXUpdates (from `../node_modules/expo-updates/ios`)
-  - EXUpdatesInterface (from `../node_modules/expo-updates-interface/ios`)
  - EXVideoThumbnails (from `../node_modules/expo-video-thumbnails/ios`)
  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
@ -675,7 +653,6 @@ DEPENDENCIES:

 SPEC REPOS:
  trunk:
-    - ASN1Decoder
    - Firebase
    - FirebaseAnalytics
    - FirebaseCore
@ -699,8 +676,6 @@ EXTERNAL SOURCES:
    :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
  DoubleConversion:
    :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
-  EASClient:
-    :path: "../node_modules/expo-eas-client/ios"
  EXApplication:
    :path: "../node_modules/expo-application/ios"
  EXAV:
@ -719,10 +694,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/expo-firebase-core/ios"
  EXFont:
    :path: "../node_modules/expo-font/ios"
-  EXJSONUtils:
-    :path: "../node_modules/expo-json-utils/ios"
-  EXManifests:
-    :path: "../node_modules/expo-manifests/ios"
  EXNotifications:
    :path: "../node_modules/expo-notifications/ios"
  Expo:
@ -749,12 +720,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/expo-splash-screen/ios"
  EXStoreReview:
    :path: "../node_modules/expo-store-review/ios"
-  EXStructuredHeaders:
-    :path: "../node_modules/expo-structured-headers/ios"
-  EXUpdates:
-    :path: "../node_modules/expo-updates/ios"
-  EXUpdatesInterface:
-    :path: "../node_modules/expo-updates-interface/ios"
  EXVideoThumbnails:
    :path: "../node_modules/expo-video-thumbnails/ios"
  FBLazyVector:
@ -863,10 +828,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon/yoga"

 SPEC CHECKSUMS:
-  ASN1Decoder: 6110fdeacfdb41559b1481457a1645be716610aa
  boost: a7c83b31436843459a1961bfd74b96033dc77234
  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  EASClient: a2581835cf9b97d0defd5d630fc6eb1bf77045e7
  EXApplication: e418d737a036e788510f2c4ad6c10a7d54d18586
  EXAV: 596506c9bee54ad52f2f3b625cdaeb9d9f2dd6b7
  EXConstants: 75c40827af38bd6bfcf69f880a5b45037eeff9c9
@ -876,8 +839,6 @@ SPEC CHECKSUMS:
  EXFirebaseAnalytics: 15c5f2d5bae6668ecb1104f98b2b74a2d9fd3740
  EXFirebaseCore: 9ee5a9691a8480f0fbaeb7f3cd135f256d436fdf
  EXFont: a5d80bd9b3452b2d5abbce2487da89b0150e6487
-  EXJSONUtils: 2a74b8f40f1523cc3f92af99c91aa78201737a77
-  EXManifests: b38dc61303f5eede990b4c8ecbfac32f82160e65
  EXNotifications: 9a2aa201deb19dfe1dbe0e370eeb2922de0d2422
  Expo: 2322364db3fe1adaa179787edb7e1bc6e5159c78
  ExpoCrypto: e534314db0e1a17ae12b5140d529bd0c5efcbc6a
@ -891,9 +852,6 @@ SPEC CHECKSUMS:
  EXSecureStore: ac4b3c89dd5810528074d9422d5fed5a9e684467
  EXSplashScreen: 31ab6df6d23e97e074d1330224741979943f1d82
  EXStoreReview: cbb6b2202bb6f831cd3234d9d8b995cec0eb32f2
-  EXStructuredHeaders: 5d86829469399370a9fc7cb1e4391b09de87681d
-  EXUpdates: 784c8c593f6649d0640e81cede66613703e3c267
-  EXUpdatesInterface: 2bbc11815dfa2ec3fc02e5534c7592c6b42b5327
  EXVideoThumbnails: 486533e1a66c9859f9b9e3b2e1f9f0b275515b48
  FBLazyVector: c71b8c429a8af2aff1013934a7152e9d9d0c937d
  FBReactNativeSpec: cb0df4f0084281b394f76bb9b4d1d9540f35963f
--- a/ios/tooot.xcodeproj/project.pbxproj
+++ b/ios/tooot.xcodeproj/project.pbxproj
@ -391,13 +391,11 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-tooot/Pods-tooot-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/EXUpdates.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXUpdates.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
--- a/ios/tooot/Supporting/Expo.plist
+++ b/ios/tooot/Supporting/Expo.plist
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>EXUpdatesCheckOnLaunch</key>
-    <string>WIFI_ONLY</string>
-    <key>EXUpdatesEnabled</key>
-    <true/>
-    <key>EXUpdatesLaunchWaitMs</key>
-    <integer>0</integer>
-    <key>EXUpdatesRequestHeaders</key>
-    <dict>
-      <key>expo-channel-name</key>
-      <string>development</string>
-    </dict>
-    <key>EXUpdatesRuntimeVersion</key>
-    <string>0</string>
-    <key>EXUpdatesURL</key>
-    <string>https://u.expo.dev/3288313f-3ff0-496a-a5a9-d8985e7cad5f</string>
-  </dict>
-</plist>
--- a/package.json
+++ b/package.json
@ -1,10 +1,6 @@
 {
  "name": "tooot",
-  "versions": {
-    "major": 4,
-    "minor": 3,
-    "patch": 2
-  },
+  "version": "4.3.2",
  "description": "tooot app for Mastodon",
  "author": "xmflsct <me@xmflsct.com>",
  "license": "GPL-3.0-or-later",
@ -62,7 +58,6 @@
    "expo-secure-store": "^11.3.0",
    "expo-splash-screen": "^0.16.1",
    "expo-store-review": "^5.3.0",
-    "expo-updates": "^0.14.4",
    "expo-video-thumbnails": "^6.4.0",
    "expo-web-browser": "^11.0.0",
    "i18next": "^21.9.1",
@ -127,4 +122,4 @@
    "react-native-clean-project": "^4.0.1",
    "typescript": "^4.7.4"
  }
-}
+}
--- a/src/i18n/de/components/contextMenu.json
+++ b/src/i18n/de/components/contextMenu.json
@ -11,7 +11,7 @@
      "action_true": ""
    },
    "reports": {
-      "action": "User melden"
+      "action": ""
    }
  },
  "copy": {
--- a/src/i18n/en/components/contextMenu.json
+++ b/src/i18n/en/components/contextMenu.json
@ -11,7 +11,7 @@
      "action_true": "Unblock user"
    },
    "reports": {
-      "action": "Report user"
+      "action": "Report and block user"
    }
  },
  "copy": {
--- a/src/i18n/it/components/contextMenu.json
+++ b/src/i18n/it/components/contextMenu.json
@ -11,7 +11,7 @@
      "action_true": "Sblocca utente"
    },
    "reports": {
-      "action": "Segnala utente"
+      "action": ""
    }
  },
  "copy": {
--- a/src/i18n/ja/components/contextMenu.json
+++ b/src/i18n/ja/components/contextMenu.json
@ -11,7 +11,7 @@
      "action_true": "ユーザーのブロックを解除"
    },
    "reports": {
-      "action": "ユーザーを報告"
+      "action": ""
    }
  },
  "copy": {
--- a/src/i18n/ko/components/contextMenu.json
+++ b/src/i18n/ko/components/contextMenu.json
@ -11,7 +11,7 @@
      "action_true": ""
    },
    "reports": {
-      "action": "사용자 신고"
+      "action": ""
    }
  },
  "copy": {
--- a/src/i18n/pt_BR/components/contextMenu.json
+++ b/src/i18n/pt_BR/components/contextMenu.json
@ -11,7 +11,7 @@
      "action_true": "Desbloquear usuário"
    },
    "reports": {
-      "action": "Denunciar usuário"
+      "action": ""
    }
  },
  "copy": {
--- a/src/i18n/vi/components/contextMenu.json
+++ b/src/i18n/vi/components/contextMenu.json
@ -11,7 +11,7 @@
      "action_true": "Bỏ chặn người dùng"
    },
    "reports": {
-      "action": "Báo cáo"
+      "action": ""
    }
  },
  "copy": {
--- a/src/i18n/zh-Hans/components/contextMenu.json
+++ b/src/i18n/zh-Hans/components/contextMenu.json
@ -11,7 +11,7 @@
      "action_true": "取消屏蔽用户"
    },
    "reports": {
-      "action": "举报用户"
+      "action": "举报并屏蔽用户"
    }
  },
  "copy": {
--- a/src/utils/checkEnvironment.ts
+++ b/src/utils/checkEnvironment.ts
@ -1,4 +1,4 @@
-import * as Updates from 'expo-updates'
+import Constants from 'expo-constants'

 const mapEnvironment = <T = unknown>({
  release,
@ -36,14 +36,14 @@ const mapEnvironment = <T = unknown>({

 const isDevelopment =
  __DEV__ ||
-  ['development'].some(channel => (Updates.channel) === channel)
+  ['development'].some(channel => (Constants.expoConfig?.extra?.environment) === channel)

 const isCandidate = ['candidate'].some(channel =>
-  (Updates.channel) === channel
+  (Constants.expoConfig?.extra?.environment) === channel
 )

 const isRelease = ['release'].some(channel =>
-  (Updates.channel) === channel
+  (Constants.expoConfig?.extra?.environment) === channel
 )

 export { mapEnvironment, isDevelopment, isCandidate, isRelease }
--- a/src/utils/slices/contextsSlice.ts
+++ b/src/utils/slices/contextsSlice.ts
@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { RootState } from '@root/store'
-import * as Updates from 'expo-updates'
+import Constants from 'expo-constants'
 import * as StoreReview from 'expo-store-review'

 export type ContextsState = {
@ -38,7 +38,7 @@ const contextsSlice = createSlice({
  initialState: contextsInitialState as ContextsState,
  reducers: {
    updateStoreReview: (state, action: PayloadAction<1>) => {
-      if (Updates.channel === 'release') {
+      if (Constants.expoConfig?.extra?.environment === 'release') {
        state.storeReview.current = state.storeReview.current + action.payload
        if (state.storeReview.current === state.storeReview.context) {
          StoreReview?.isAvailableAsync().then(() =>
--- a/yarn.lock
+++ b/yarn.lock
@ -1170,7 +1170,7 @@
    uuid "^3.4.0"
    wrap-ansi "^7.0.0"

-"@expo/code-signing-certificates@0.0.2", "@expo/code-signing-certificates@^0.0.2":
+"@expo/code-signing-certificates@^0.0.2":
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@expo/code-signing-certificates/-/code-signing-certificates-0.0.2.tgz#65cd615800e6724b54831c966dd1a90145017246"
  integrity sha512-vnPHFjwOqxQ1VLztktY+fYCfwvLzjqpzKn09rchcQE7Sdf0wtW5fFtIZBEFOOY5wasp8tXSnp627zrAwazPHzg==
@ -1316,7 +1316,7 @@
    json5 "^1.0.1"
    write-file-atomic "^2.3.0"

-"@expo/metro-config@~0.3.18", "@expo/metro-config@~0.3.19":
+"@expo/metro-config@~0.3.18":
  version "0.3.22"
  resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.3.22.tgz#fa4a0729ec8ecbc9c9fb79c63ecc66a299505c82"
  integrity sha512-R81sLbaeUBjN8IXcxiVx7GcpSj8z7szILl1b5yJDb38WdIFwxhrseA5wXaTT1yMhI+59w6n99T2qtFV2yD5qYA==
@ -3949,11 +3949,6 @@ expo-device@^4.3.0:
  dependencies:
    ua-parser-js "^0.7.19"

-expo-eas-client@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/expo-eas-client/-/expo-eas-client-0.3.0.tgz#21383fc95a52e71e13c7276456db20388fefcf95"
-  integrity sha512-dBD00lJ629ayh5abbmgn6I1Z5NOaWM1iea2ODLd/EF1ZcS1P3yiPm6blpvL/tD+uewL8gxxmla/Ac+SiDdYAYA==
-
 expo-error-recovery@~3.2.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/expo-error-recovery/-/expo-error-recovery-3.2.0.tgz#3a4543382904a5e70829cb41d7fc0f022c2bef6e"
@ -3993,11 +3988,6 @@ expo-haptics@^11.3.0:
  resolved "https://registry.yarnpkg.com/expo-haptics/-/expo-haptics-11.3.0.tgz#74283bd212a86f16ff2d6b0125e2a9604c940523"
  integrity sha512-mQYSZsJ7LcdM2b8JecrV2qEw9ymNzGleS/+bpufdHZ+n5tCnWZXiMvZFFczaExHfaeGY3nGQvH1RjEOFIXSfig==

-expo-json-utils@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/expo-json-utils/-/expo-json-utils-0.3.0.tgz#0c4a0195ee2bbde02cbb5f4d384d1cb63bea7493"
-  integrity sha512-ceo0pWFJqRAsNjZWX3rVDhy+NDzmrBNFOdvW+HE4EHqlt+OEUu9INIYKO8fU+g3ifI0VcKqHfvvj5wKsSpvPBw==
-
 expo-keep-awake@~10.2.0:
  version "10.2.0"
  resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-10.2.0.tgz#46f04740bccd321732bbbed93491e2076d5dbbd7"
@ -4021,13 +4011,6 @@ expo-localization@^13.1.0:
  dependencies:
    rtl-detect "^1.0.2"

-expo-manifests@~0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/expo-manifests/-/expo-manifests-0.3.1.tgz#52c3ef41d3b1958039be0434363e6499c773aaf6"
-  integrity sha512-zv2a4pzhbvxVjrTO4XEiP5THt4RwtxyJjfixFhDNfHtDQR7fS4h9sZSGX9ind+IS5SQJQ2ykfVAi8xnwP6zHaw==
-  dependencies:
-    expo-json-utils "~0.3.0"
-
 expo-modules-autolinking@0.10.2:
  version "0.10.2"
  resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-0.10.2.tgz#9a6cdc0f187da4663607b719dcf400402cc5b776"
@ -4093,34 +4076,6 @@ expo-store-review@^5.3.0:
  resolved "https://registry.yarnpkg.com/expo-store-review/-/expo-store-review-5.3.0.tgz#f8b1253a607b13e548889a442d8ee7bb0fa025a3"
  integrity sha512-abWgsgXnfeJnAINOVGWxFC0HXizZxBoxNZoekswqW2AtsQ6DR5nvWj5VyovVjd8DktRG/ly1ZKJwP0KNXqWffw==

-expo-structured-headers@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/expo-structured-headers/-/expo-structured-headers-2.2.1.tgz#739f969101de6bead921eee59e5899399ad67715"
-  integrity sha512-nY6GuvoS/U5XdhfBNmvXGRoGzIXywXpSZs2wdiP+FbS79P9UWyEqzgARrBTF+6pQxUVMs6/vdffxRpwhjwYPug==
-
-expo-updates-interface@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/expo-updates-interface/-/expo-updates-interface-0.7.0.tgz#f4f03b61dbdd949cac9fb44e250e1162ba177650"
-  integrity sha512-saThnbrYDSjKxfMFFguAvh5o5KGabvAOHItkJRwq2L3c0T/3q26Q0kM83880h/+TTtAVsl1+Vhny9d+ImD3yvQ==
-
-expo-updates@^0.14.4:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/expo-updates/-/expo-updates-0.14.4.tgz#5fd6708c8438dabc50c1a68329b3caebc9ec9a65"
-  integrity sha512-+TbhUmsbjkOMHR/fhZEtcIf7xa8d/UbcvicIAr6jD9FfluBoRatB2sXiswBEohQeQov4P4XlfBKyNE5QTpu0Xw==
-  dependencies:
-    "@expo/code-signing-certificates" "0.0.2"
-    "@expo/config" "~7.0.1"
-    "@expo/config-plugins" "~5.0.1"
-    "@expo/metro-config" "~0.3.19"
-    arg "4.1.0"
-    expo-eas-client "~0.3.0"
-    expo-manifests "~0.3.0"
-    expo-structured-headers "~2.2.0"
-    expo-updates-interface "~0.7.0"
-    fbemitter "^3.0.0"
-    resolve-from "^5.0.0"
-    uuid "^3.4.0"
-
 expo-video-thumbnails@^6.4.0:
  version "6.4.0"
  resolved "https://registry.yarnpkg.com/expo-video-thumbnails/-/expo-video-thumbnails-6.4.0.tgz#59603af06c1d2122c2f7db854562236bbd8319ec"