From 3e52f175b7d8208046c8d2c4d382f2e578fb8681 Mon Sep 17 00:00:00 2001 From: Zhiyuan Zheng Date: Fri, 16 Apr 2021 14:58:18 +0200 Subject: [PATCH] Fixes --- VERSIONING.md | 9 +++++---- fastlane/Fastfile | 2 +- src/screens/Tabs/Me/Settings/Tooot.tsx | 2 +- src/utils/slices/contextsSlice.ts | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/VERSIONING.md b/VERSIONING.md index 389dcb44..c9d788ad 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -21,10 +21,11 @@ ## OTA release channels - * `MAJOR-environment`. Environments include `production`, `staging` and `development`. + * `MAJOR-environment`. Environments include `release`, `candidate` and `development`. ## Major versions mapping to native module versions -| Major version | Native module version | -| :-----------: | :-------------------: | -| `0` | `210201` | \ No newline at end of file +| Major version | Native module version | Expo version | +| :-----------: | :-------------------: | :----------: | +| `0` | `210201` | `40.0.0` | +| `1` | `210317` | `40.0.0` | \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index df7c1cf9..a2a11877 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -106,7 +106,7 @@ private_lane :build_ios do output_directory: BUILD_DIRECTORY, silent: true ) - upload_to_app_store( ipa: IPA_FILE ) + upload_to_app_store( ipa: IPA_FILE, app_version: VERSION ) else if !is_ci match( type: "development", readonly: true ) diff --git a/src/screens/Tabs/Me/Settings/Tooot.tsx b/src/screens/Tabs/Me/Settings/Tooot.tsx index af826876..35194f39 100644 --- a/src/screens/Tabs/Me/Settings/Tooot.tsx +++ b/src/screens/Tabs/Me/Settings/Tooot.tsx @@ -43,7 +43,7 @@ const SettingsTooot: React.FC = () => { }} /> {__DEV__ || - ['production', 'development'].some(channel => + ['release', 'development'].some(channel => Updates.releaseChannel?.includes(channel) ) ? ( ) => { - if (Updates.releaseChannel.includes('production')) { + if (Updates.releaseChannel.includes('release')) { state.storeReview.current = state.storeReview.current + action.payload if (state.storeReview.current === state.storeReview.context) { StoreReview.isAvailableAsync().then(() => StoreReview.requestReview())