diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ddf3ce96..d455be6c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -4,6 +4,8 @@ PODS: - DoubleConversion (1.1.6) - EASClient (0.2.1): - ExpoModulesCore + - EXApplication (4.1.0): + - ExpoModulesCore - EXAV (11.2.3): - ExpoModulesCore - React-runtimeexecutor @@ -23,15 +25,17 @@ PODS: - EXFirebaseCore (5.0.0): - ExpoModulesCore - Firebase/Core (= 8.14.0) + - EXFont (10.1.0): + - ExpoModulesCore - EXImageLoader (3.2.0): - ExpoModulesCore - React-Core - EXJSONUtils (0.3.0) - EXManifests (0.3.0): - EXJSONUtils - - EXNotifications (0.14.1): + - EXNotifications (0.15.2): - ExpoModulesCore - - Expo (45.0.3): + - Expo (45.0.4): - ExpoModulesCore - ExpoCrypto (10.2.0): - ExpoModulesCore @@ -42,6 +46,8 @@ PODS: - ExpoModulesCore - ExpoImagePicker (13.1.1): - ExpoModulesCore + - ExpoKeepAwake (10.1.1): + - ExpoModulesCore - ExpoLocalization (13.0.0): - ExpoModulesCore - ExpoModulesCore (0.9.2): @@ -571,14 +577,13 @@ PODS: - Sentry (7.11.0): - Sentry/Core (= 7.11.0) - Sentry/Core (7.11.0) - - UMTaskManagerInterface (7.1.1): - - ExpoModulesCore - Yoga (1.14.0) 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`) - EXDevice (from `../node_modules/expo-device/ios`) @@ -586,6 +591,7 @@ DEPENDENCIES: - EXFileSystem (from `../node_modules/expo-file-system/ios`) - EXFirebaseAnalytics (from `../node_modules/expo-firebase-analytics/ios`) - EXFirebaseCore (from `../node_modules/expo-firebase-core/ios`) + - EXFont (from `../node_modules/expo-font/ios`) - EXImageLoader (from `../node_modules/expo-image-loader/ios`) - EXJSONUtils (from `../node_modules/expo-json-utils/ios`) - EXManifests (from `../node_modules/expo-manifests/ios`) @@ -595,6 +601,7 @@ DEPENDENCIES: - ExpoHaptics (from `../node_modules/expo-haptics/ios`) - ExpoImageManipulator (from `../node_modules/expo-image-manipulator/ios`) - ExpoImagePicker (from `../node_modules/expo-image-picker/ios`) + - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`) - ExpoLocalization (from `../node_modules/expo-localization/ios`) - ExpoModulesCore (from `../node_modules/expo-modules-core/ios`) - ExpoRandom (from `../node_modules/expo-random/ios`) @@ -656,7 +663,6 @@ DEPENDENCIES: - "RNSentry (from `../node_modules/@sentry/react-native`)" - RNShareMenu (from `../node_modules/react-native-share-menu`) - RNSVG (from `../node_modules/react-native-svg`) - - UMTaskManagerInterface (from `../node_modules/unimodules-task-manager-interface/ios`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: @@ -687,6 +693,8 @@ EXTERNAL SOURCES: :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: :path: "../node_modules/expo-av/ios" EXConstants: @@ -701,6 +709,8 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-firebase-analytics/ios" EXFirebaseCore: :path: "../node_modules/expo-firebase-core/ios" + EXFont: + :path: "../node_modules/expo-font/ios" EXImageLoader: :path: "../node_modules/expo-image-loader/ios" EXJSONUtils: @@ -719,6 +729,8 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-image-manipulator/ios" ExpoImagePicker: :path: "../node_modules/expo-image-picker/ios" + ExpoKeepAwake: + :path: "../node_modules/expo-keep-awake/ios" ExpoLocalization: :path: "../node_modules/expo-localization/ios" ExpoModulesCore: @@ -833,8 +845,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-share-menu" RNSVG: :path: "../node_modules/react-native-svg" - UMTaskManagerInterface: - :path: "../node_modules/unimodules-task-manager-interface/ios" Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" @@ -843,6 +853,7 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 EASClient: 93565f4d024559b75eac62bc7d50acaa354614f6 + EXApplication: d6562af1204162e0ac46d341a7d4e5dc720b33de EXAV: 88f61c5af8415715b7ee51f084c1020235b85c56 EXConstants: fdbe52259365b6a6faaa5e99a3b82cfa6bc2eb61 EXDevice: 0115b360059ccd32c1701744e374e3259ffbdd3c @@ -850,15 +861,17 @@ SPEC CHECKSUMS: EXFileSystem: 2aa2d9289f84bca9532b9ccbd81504fa31eb1ded EXFirebaseAnalytics: aeefc63f92277313c3ee86da6a7ecf892f345ed1 EXFirebaseCore: bdfa87df74fa1b74a6b38957561456aabad28a4f + EXFont: 04235cc22e6fef86028feb67db452978dc6f240f EXImageLoader: b88e053d760f85a82405b1db2de4abf11978fc9f EXJSONUtils: 2a74b8f40f1523cc3f92af99c91aa78201737a77 EXManifests: 0c6134b7b6f3236a93a778c3f44ba1cfb3f9fa3d - EXNotifications: a7d582fa800d77f4a75bd22d52e84e2fbcee26df - Expo: 353cd6d2154838c0c8bb1072d3ac89eb535a2ef4 + EXNotifications: ea9fc56d27d1fee229489c5d8f452c7f367c237e + Expo: 64d52669fa3b9342919b5b44b2b4f15f19b0cf76 ExpoCrypto: d0d0f3e20875dc450b4ec88f0fb608da5c2c6c17 ExpoHaptics: ad58ec96a25e57579c14a47c7d71f0de0de8656a ExpoImageManipulator: b55580bbc7b10099c7707949903e7176a8542ee8 ExpoImagePicker: d9d6b4f29db437fc7796f13cee5f133f5b4b5f7c + ExpoKeepAwake: c0c494b442ecd8122974c13b93ccfb57bd408e88 ExpoLocalization: 8f619bb6eec64575cd5220bfabbd7b4e2d6f33f8 ExpoModulesCore: e4278a668e8c13c0269ed8b8a4200989deea2973 ExpoRandom: 14df0976aa363a71a730ceb7655250f3047c0e42 @@ -933,7 +946,6 @@ SPEC CHECKSUMS: SDWebImage: 0905f1b7760fc8ac4198cae0036600d67478751e SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815 Sentry: 0c5cd63d714187b4a39c331c1f0eb04ba7868341 - UMTaskManagerInterface: 3184c93ecc290bd422c6e344badc89b601e9c29b Yoga: 99652481fcd320aefa4a7ef90095b95acd181952 PODFILE CHECKSUM: d6d20fa7c51228cebc309aed987ed7d8f4274844 diff --git a/package.json b/package.json index 72249e8f..2b9bfe16 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,8 @@ "@sentry/react-native": "3.4.2", "@sharcoux/slider": "6.0.3", "axios": "0.27.2", - "expo": "45.0.3", - "expo-auth-session": "3.6.0", + "expo": "45.0.4", + "expo-auth-session": "3.6.1", "expo-av": "11.2.3", "expo-constants": "^13.1.1", "expo-crypto": "10.2.0", @@ -59,7 +59,7 @@ "expo-image-picker": "13.1.1", "expo-linking": "3.1.0", "expo-localization": "13.0.0", - "expo-notifications": "0.14.1", + "expo-notifications": "0.15.2", "expo-random": "12.2.0", "expo-screen-capture": "4.2.0", "expo-secure-store": "11.2.0", @@ -68,7 +68,7 @@ "expo-updates": "0.13.1", "expo-video-thumbnails": "6.3.0", "expo-web-browser": "10.2.0", - "i18next": "21.8.1", + "i18next": "21.8.2", "li": "1.3.0", "lodash": "4.17.21", "react": "17.0.2", @@ -105,7 +105,7 @@ "@babel/core": "7.17.10", "@babel/plugin-proposal-optional-chaining": "7.16.7", "@babel/preset-typescript": "7.16.7", - "@expo/config": "6.0.23", + "@expo/config": "6.0.24", "@types/lodash": "4.14.182", "@types/react": "17.0.43", "@types/react-dom": "17.0.14", diff --git a/src/screens/Tabs/Me/Push.tsx b/src/screens/Tabs/Me/Push.tsx index 147a5874..568ccc17 100644 --- a/src/screens/Tabs/Me/Push.tsx +++ b/src/screens/Tabs/Me/Push.tsx @@ -4,7 +4,7 @@ import Icon from '@components/Icon' import { MenuContainer, MenuRow } from '@components/Menu' import CustomText from '@components/Text' import { useAppDispatch } from '@root/store' -import { isDevelopment } from '@utils/checkEnvironment' +import { isDevelopment, isRelease } from '@utils/checkEnvironment' import { updateInstancePush } from '@utils/slices/instances/updatePush' import { updateInstancePushAlert } from '@utils/slices/instances/updatePushAlert' import { updateInstancePushDecode } from '@utils/slices/instances/updatePushDecode' @@ -36,9 +36,8 @@ const TabMePush: React.FC = () => { const dispatch = useAppDispatch() const instancePush = useSelector(getInstancePush) - const [pushAvailable, setPushAvailable] = useState( - undefined - ) + const [pushAvailable, setPushAvailable] = + useState() const [pushEnabled, setPushEnabled] = useState() const [pushCanAskAgain, setPushCanAskAgain] = useState() const checkPush = async () => { @@ -49,13 +48,13 @@ const TabMePush: React.FC = () => { } useEffect(() => { if (isDevelopment) { - setPushAvailable(true) + setPushAvailable({ data: '', type: 'expo' }) } else { Notifications.getExpoPushTokenAsync({ experienceId: '@xmflsct/tooot' }) - .then(data => setPushAvailable(!!data)) - .catch(() => setPushAvailable(false)) + .then(data => setPushAvailable(data)) + .catch(() => setPushAvailable(undefined)) } checkPush() @@ -114,7 +113,7 @@ const TabMePush: React.FC = () => { return ( - {pushAvailable === true ? ( + {!!pushAvailable ? ( <> {pushEnabled === false ? ( @@ -191,6 +190,13 @@ const TabMePush: React.FC = () => { /> {alerts} + {!isRelease ? ( + + + {pushAvailable.data} + + + ) : null} ) : (