Merge pull request #294 from tooot-app/main

Release v4
2025-02-09 16:38:41 +01:00 · 2022-05-15 01:27:04 +02:00 · 2022-05-15 01:27:04 +02:00 · b407d66758
commit b407d66758
parent 824314faad 265db6abce
7 changed files with 89 additions and 31 deletions
--- 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,6 +25,8 @@ PODS:
  - EXFirebaseCore (5.0.0):
    - ExpoModulesCore
    - Firebase/Core (= 8.14.0)
+  - EXFont (10.1.0):
+    - ExpoModulesCore
  - EXImageLoader (3.2.0):
    - ExpoModulesCore
    - React-Core
@ -31,7 +35,7 @@ PODS:
    - EXJSONUtils
  - 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):
@ -577,6 +583,7 @@ 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`)
@ -584,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`)
@ -593,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`)
@ -684,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:
@ -698,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:
@ -716,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:
@ -838,6 +853,7 @@ SPEC CHECKSUMS:
  boost: a7c83b31436843459a1961bfd74b96033dc77234
  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
  EASClient: 93565f4d024559b75eac62bc7d50acaa354614f6
+  EXApplication: d6562af1204162e0ac46d341a7d4e5dc720b33de
  EXAV: 88f61c5af8415715b7ee51f084c1020235b85c56
  EXConstants: fdbe52259365b6a6faaa5e99a3b82cfa6bc2eb61
  EXDevice: 0115b360059ccd32c1701744e374e3259ffbdd3c
@ -845,15 +861,17 @@ SPEC CHECKSUMS:
  EXFileSystem: 2aa2d9289f84bca9532b9ccbd81504fa31eb1ded
  EXFirebaseAnalytics: aeefc63f92277313c3ee86da6a7ecf892f345ed1
  EXFirebaseCore: bdfa87df74fa1b74a6b38957561456aabad28a4f
+  EXFont: 04235cc22e6fef86028feb67db452978dc6f240f
  EXImageLoader: b88e053d760f85a82405b1db2de4abf11978fc9f
  EXJSONUtils: 2a74b8f40f1523cc3f92af99c91aa78201737a77
  EXManifests: 0c6134b7b6f3236a93a778c3f44ba1cfb3f9fa3d
  EXNotifications: ea9fc56d27d1fee229489c5d8f452c7f367c237e
-  Expo: 353cd6d2154838c0c8bb1072d3ac89eb535a2ef4
+  Expo: 64d52669fa3b9342919b5b44b2b4f15f19b0cf76
  ExpoCrypto: d0d0f3e20875dc450b4ec88f0fb608da5c2c6c17
  ExpoHaptics: ad58ec96a25e57579c14a47c7d71f0de0de8656a
  ExpoImageManipulator: b55580bbc7b10099c7707949903e7176a8542ee8
  ExpoImagePicker: d9d6b4f29db437fc7796f13cee5f133f5b4b5f7c
+  ExpoKeepAwake: c0c494b442ecd8122974c13b93ccfb57bd408e88
  ExpoLocalization: 8f619bb6eec64575cd5220bfabbd7b4e2d6f33f8
  ExpoModulesCore: e4278a668e8c13c0269ed8b8a4200989deea2973
  ExpoRandom: 14df0976aa363a71a730ceb7655250f3047c0e42
--- 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",
@ -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",
--- a/src/screens/Tabs/Me/Push.tsx
+++ b/src/screens/Tabs/Me/Push.tsx
@ -36,9 +36,7 @@ const TabMePush: React.FC = () => {
  const dispatch = useAppDispatch()
  const instancePush = useSelector(getInstancePush)

-  const [pushAvailable, setPushAvailable] = useState<boolean | undefined>(
-    undefined
-  )
+  const [pushAvailable, setPushAvailable] = useState<boolean>()
  const [pushEnabled, setPushEnabled] = useState<boolean>()
  const [pushCanAskAgain, setPushCanAskAgain] = useState<boolean>()
  const checkPush = async () => {
@ -52,7 +50,8 @@ const TabMePush: React.FC = () => {
      setPushAvailable(true)
    } else {
      Notifications.getExpoPushTokenAsync({
-        experienceId: '@xmflsct/tooot'
+        experienceId: '@xmflsct/tooot',
+        applicationId: 'com.xmflsct.tooot.app'
      })
        .then(data => setPushAvailable(!!data))
        .catch(() => setPushAvailable(false))
@ -114,7 +113,7 @@ const TabMePush: React.FC = () => {

  return (
    <ScrollView>
-      {pushAvailable === true ? (
+      {!!pushAvailable ? (
        <>
          {pushEnabled === false ? (
            <MenuContainer>
--- a/src/utils/push/useConnect.ts
+++ b/src/utils/push/useConnect.ts
@ -25,7 +25,8 @@ const pushUseConnect = ({ t, instances }: Params) => {
        ? 'DEVELOPMENT_TOKEN_1'
        : (
            await Notifications.getExpoPushTokenAsync({
-              experienceId: '@xmflsct/tooot'
+              experienceId: '@xmflsct/tooot',
+              applicationId: 'com.xmflsct.tooot.app'
            })
          ).data

--- a/src/utils/slices/instances/updatePush.ts
+++ b/src/utils/slices/instances/updatePush.ts
@ -17,7 +17,8 @@ export const updateInstancePush = createAsyncThunk(
      ? 'DEVELOPMENT_TOKEN_1'
      : (
          await Notifications.getExpoPushTokenAsync({
-            experienceId: '@xmflsct/tooot'
+            experienceId: '@xmflsct/tooot',
+            applicationId: 'com.xmflsct.tooot.app'
          })
        ).data

--- a/src/utils/slices/instances/updatePushDecode.ts
+++ b/src/utils/slices/instances/updatePushDecode.ts
@ -24,7 +24,8 @@ export const updateInstancePushDecode = createAsyncThunk(
      ? 'DEVELOPMENT_TOKEN_1'
      : (
          await Notifications.getExpoPushTokenAsync({
-            experienceId: '@xmflsct/tooot'
+            experienceId: '@xmflsct/tooot',
+            applicationId: 'com.xmflsct.tooot.app'
          })
        ).data

--- a/yarn.lock
+++ b/yarn.lock
@ -1309,6 +1309,27 @@
    xcode "^3.0.1"
    xml2js "0.4.23"

+"@expo/config-plugins@4.1.5":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.1.5.tgz#9d357d2cda9c095e511b51583ede8a3b76174068"
+  integrity sha512-RVvU40RtZt12HavuDAe+LDIq9lHj7sheOfMEHdmpJ/uTA8pgvkbc56XF6JHQD+yRr6+uhhb+JnAasGq49dsQbw==
+  dependencies:
+    "@expo/config-types" "^45.0.0"
+    "@expo/json-file" "8.2.36"
+    "@expo/plist" "0.0.18"
+    "@expo/sdk-runtime-versions" "^1.0.0"
+    "@react-native/normalize-color" "^2.0.0"
+    chalk "^4.1.2"
+    debug "^4.3.1"
+    find-up "~5.0.0"
+    getenv "^1.0.0"
+    glob "7.1.6"
+    resolve-from "^5.0.0"
+    semver "^7.3.5"
+    slash "^3.0.0"
+    xcode "^3.0.1"
+    xml2js "0.4.23"
+
 "@expo/config-plugins@^2.0.2":
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-2.0.4.tgz#955fd70a2aeefbe99ec71cecb1d7ea7b626dc79e"
@ -1381,6 +1402,23 @@
    slugify "^1.3.4"
    sucrase "^3.20.0"

+"@expo/config@6.0.24":
+  version "6.0.24"
+  resolved "https://registry.yarnpkg.com/@expo/config/-/config-6.0.24.tgz#3602da8fdfa817e290a52fb328fc8ed9d6bc61e7"
+  integrity sha512-OcACI1md1Yo5TQmUxxueJ/RaTlR2Mgl6KswTFOYCL1XJERF/jjAx95zhWXH+JQGdlM0yB0vqM6vB6GbUFRvLxA==
+  dependencies:
+    "@babel/code-frame" "~7.10.4"
+    "@expo/config-plugins" "4.1.5"
+    "@expo/config-types" "^45.0.0"
+    "@expo/json-file" "8.2.36"
+    getenv "^1.0.0"
+    glob "7.1.6"
+    require-from-string "^2.0.2"
+    resolve-from "^5.0.0"
+    semver "7.3.2"
+    slugify "^1.3.4"
+    sucrase "^3.20.0"
+
 "@expo/configure-splash-screen@^0.6.0":
  version "0.6.0"
  resolved "https://registry.yarnpkg.com/@expo/configure-splash-screen/-/configure-splash-screen-0.6.0.tgz#07d97ee512fd859fcc09506ba3762fd6263ebc39"
@ -4118,10 +4156,10 @@ expo-asset@~8.5.0:
    path-browserify "^1.0.0"
    url-parse "^1.5.9"

-expo-auth-session@3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/expo-auth-session/-/expo-auth-session-3.6.0.tgz#764955fdea32ee9341e4cbb68708a70632654260"
-  integrity sha512-BBDCpwtEiZrfWxL4toU8/JTerLQqjI8D0bv//cmFSBPn0EdbzvSLFQnAMEzgzwBq99YvsloCCeVKWiK1gc9jZQ==
+expo-auth-session@3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/expo-auth-session/-/expo-auth-session-3.6.1.tgz#f31d62487f55e9947ead147999d3099e860cf9fc"
+  integrity sha512-6TNtzlp4Ot83hBpJL9qZRmmqGpIUK5eF6GzG9w7NblkaxM0cHOxqtK3gmgfr8ezFl7lMQMkKax+RPbTo/vhzzA==
  dependencies:
    expo-constants "~13.1.0"
    expo-crypto "~10.2.0"
@ -4256,10 +4294,10 @@ expo-manifests@~0.3.0:
  dependencies:
    expo-json-utils "~0.3.0"

-expo-modules-autolinking@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-0.8.0.tgz#d380e0de6848f71d7c99d46100608f6030eb66c8"
-  integrity sha512-dFypBI1bnT62mNRI6B1KxnHqvbvr+vzqqAjZZ7Tud8VUIHGl4MpeNHNAoeGdmjX+rJsGjC1y70OvtwYjUWiMLw==
+expo-modules-autolinking@0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-0.8.1.tgz#533c38192847d2272e9af986f8f4c58aae6dfff3"
+  integrity sha512-S8qfaXCv//7tQWV9M+JKx3CF7ypYhDdSUbkUQdaVO/r8D76/aRTArY/aRw1yEfaAOzyK8C8diDToV1itl51DfQ==
  dependencies:
    chalk "^4.1.0"
    commander "^7.2.0"
@ -4372,10 +4410,10 @@ expo-web-browser@10.2.0, expo-web-browser@~10.2.0:
  dependencies:
    compare-urls "^2.0.0"

-expo@45.0.3:
-  version "45.0.3"
-  resolved "https://registry.yarnpkg.com/expo/-/expo-45.0.3.tgz#7682b4dd29c6ec9de440bc151c3aa43ec392ec6e"
-  integrity sha512-xI22uW8ekA5152mcN1bgXLFOFO0a2eafHr0Kgq80BvV6MyYbkZS3M8trtjo9Cs6LVMMVgyc0MWI/2cd5sGjMgg==
+expo@45.0.4:
+  version "45.0.4"
+  resolved "https://registry.yarnpkg.com/expo/-/expo-45.0.4.tgz#a34d250605d5603e3cea4acf169aedd288df477b"
+  integrity sha512-S/6rwmgG+1cyHP1hCmylk9FLnavUWd/haWgVc8sUNiavaMBu/vCjeLUESFVJdYRKKN9i+avSzHdAVdKytNYo6A==
  dependencies:
    "@babel/runtime" "^7.14.0"
    "@expo/cli" "0.1.4"
@ -4388,7 +4426,7 @@ expo@45.0.3:
    expo-file-system "~14.0.0"
    expo-font "~10.1.0"
    expo-keep-awake "~10.1.1"
-    expo-modules-autolinking "0.8.0"
+    expo-modules-autolinking "0.8.1"
    expo-modules-core "0.9.2"
    fbemitter "^3.0.0"
    getenv "^1.0.0"
@ -5028,10 +5066,10 @@ https-proxy-agent@^5.0.0:
    agent-base "6"
    debug "4"

-i18next@21.8.1:
-  version "21.8.1"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.8.1.tgz#44e083ade3dfe08c8099882c560d3c7294cdf679"
-  integrity sha512-uulZBD5kLME7Ucz8pFwpC7jXDjq4BHkio3b6GBw1ykXNHA8rIAk1S2t6zb2Ripf9OMetMkysiDRlPlCVqjvQeg==
+i18next@21.8.2:
+  version "21.8.2"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.8.2.tgz#b2d9fd7feafc1a9929651c24a5c17ba703552bbc"
+  integrity sha512-H/oQvA/OXcqurXHemlyDwdIzr9GHYg5/xBuDeFXTXJGMOJFH0ke1wgbsDjFFk2noD4cJfzicVPpUtp39Z+OzgQ==
  dependencies:
    "@babel/runtime" "^7.17.2"