fix: 🐛 Fixes merge with main

apps/skolplattformen-sthlm/App.js

@@ -1,6 +1,6 @@
 import * as eva from '@eva-design/eva'
 import AsyncStorage from '@react-native-async-storage/async-storage'
-import CookieManager from '@react-native-community/cookies'
+import CookieManager from '@react-native-cookies/cookies'
 import init from '@skolplattformen/api-skolplattformen'
 import { ApiProvider } from '@skolplattformen/hooks'
 import { ApplicationProvider, IconRegistry } from '@ui-kitten/components'

apps/skolplattformen-sthlm/ios/Podfile.lock

@@ -287,7 +287,7 @@ PODS:
     - React-jsi (= 0.65.1)
     - React-perflogger (= 0.65.1)
   - React-jsinspector (0.65.1)
-  - react-native-cookies (5.0.1):
+  - react-native-cookies (6.0.11):
     - React-Core
   - react-native-restart (0.0.22):
     - React-Core
@@ -461,7 +461,7 @@ DEPENDENCIES:
   - React-jsi (from `../../../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../../../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../../../node_modules/react-native/ReactCommon/jsinspector`)
-  - "react-native-cookies (from `../../../node_modules/@react-native-community/cookies`)"
+  - "react-native-cookies (from `../../../node_modules/@react-native-cookies/cookies`)"
   - react-native-restart (from `../../../node_modules/react-native-restart`)
   - react-native-safe-area-context (from `../../../node_modules/react-native-safe-area-context`)
   - react-native-simple-toast (from `../../../node_modules/react-native-simple-toast`)
@@ -545,7 +545,7 @@ EXTERNAL SOURCES:
   React-jsinspector:
     :path: "../../../node_modules/react-native/ReactCommon/jsinspector"
   react-native-cookies:
-    :path: "../../../node_modules/@react-native-community/cookies"
+    :path: "../../../node_modules/@react-native-cookies/cookies"
   react-native-restart:
     :path: "../../../node_modules/react-native-restart"
   react-native-safe-area-context:
@@ -635,7 +635,7 @@ SPEC CHECKSUMS:
   React-jsi: 12913c841713a15f64eabf5c9ad98592c0ec5940
   React-jsiexecutor: 43f2542aed3c26e42175b339f8d37fe3dd683765
   React-jsinspector: 41e58e5b8e3e0bf061fdf725b03f2144014a8fb0
-  react-native-cookies: ce50e42ace7cf0dd47769260ca5bbe8eee607e4e
+  react-native-cookies: cd92f3824ed1e32a20802e8185101e14bb5b76da
   react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
   react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
   react-native-simple-toast: bf002828cf816775a6809f7a9ec3907509bce11f

apps/skolplattformen-sthlm/package.json

@@ -15,23 +15,42 @@
     "check-i18n": "npm run i18n -- --check"
   },
   "dependencies": {
-    "react": "*",
-    "react-native": "*",
-    "@testing-library/react-native": "*",
-    "@testing-library/jest-native": "*",
     "@eva-design/eva": "*",
     "@eva-design/material": "*",
     "@react-native-async-storage/async-storage": "*",
-    "@react-native-community/cookies": "*",
     "@react-native-community/datetimepicker": "*",
     "@react-native-community/masked-view": "*",
+    "@react-native-cookies/cookies": "*",
     "@react-navigation/bottom-tabs": "*",
     "@react-navigation/native": "*",
     "@react-navigation/stack": "*",
+    "@testing-library/jest-native": "*",
+    "@testing-library/react-hooks": "*",
+    "@testing-library/react-native": "*",
+    "@testing-library/react": "*",
     "@ui-kitten/components": "*",
     "@ui-kitten/eva-icons": "*",
     "@ui-kitten/metro-config": "*",
+    "buffer": "*",
+    "camelcase-keys": "*",
+    "change-case": "*",
+    "deepmerge": "*",
+    "events": "*",
+    "fast-fuzzy": "*",
+    "fetch-cookie": "*",
+    "formik": "*",
+    "h2m": "*",
+    "he": "*",
     "hermes-engine": "*",
+    "https-proxy-agent": "*",
+    "i18n-js": "*",
+    "js-htmlencode": "*",
+    "luxon": "*",
+    "moment": "*",
+    "node-blob": "*",
+    "node-fetch": "*",
+    "node-html-parser": "*",
+    "personnummer": "*",
     "react-native-animatable": "*",
     "react-native-calendar-events": "*",
     "react-native-dev-menu": "*",
@@ -49,6 +68,7 @@
     "react-native-svg": "*",
     "react-native-typography": "*",
     "react-native-webview": "*",
+<<<<<<< HEAD
     "formik": "*",
     "moment": "*",
     "personnummer": "*",
@@ -73,10 +93,21 @@
     "h2m": "*",
     "js-htmlencode": "*",
     "regenerator-runtime": "*",
+=======
+    "react-native": "*",
+>>>>>>> 1ef5dd58bcec89cb16249459d30502a5b8a14681
     "react-redux": "*",
+    "react": "*",
     "redux": "*",
+<<<<<<< HEAD
     "@testing-library/react": "*",
     "@react-native-cookies/cookies": "*"
+=======
+    "regenerator-runtime": "*",
+    "tough-cookie": "*",
+    "valtio": "*",
+    "yup": "*"
+>>>>>>> 1ef5dd58bcec89cb16249459d30502a5b8a14681
   },
   "devDependencies": {},
   "private": true

libs/api-skolplattformen/README.md

@@ -17,7 +17,7 @@ the concrete implementation of fetch and cookie handler must be injected.
 
 ```javascript
 import init from '@skolplattformen/api-skolplattformen'
-import CookieManager from '@react-native-community/cookies'
+import CookieManager from '@react-native-cookies/cookies'
 
 const api = init(fetch, () => CookieManager.clearAll())
 ```

libs/hooks/README.md

@@ -19,7 +19,7 @@ In order to use api hooks, you must wrap your app in an ApiProvider
 import React from 'react'
 import { ApiProvider } from '@skolplattformen/hooks'
 import init from '@skolplattformen/api-skolplattformen'
-import { CookieManager } from '@react-native-community/cookies'
+import { CookieManager } from '@react-native-cookies/cookies'
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import { RootComponent } from './components/root'
 import crashlytics from '@react-native-firebase/crashlytics'

package.json

@@ -17,7 +17,6 @@
     "@eva-design/eva": "2.0.0",
     "@eva-design/material": "2.0.0",
     "@react-native-async-storage/async-storage": "1.15.9",
-    "@react-native-community/cookies": "5.0.1",
     "@react-native-community/datetimepicker": "3.4.3",
     "@react-native-community/masked-view": "^0.1.11",
     "@react-native-cookies/cookies": "^6.0.7",

yarn.lock

@@ -2015,13 +2015,6 @@
     sudo-prompt "^9.0.0"
     wcwidth "^1.0.1"
 
-"@react-native-community/cookies@5.0.1":
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/@react-native-community/cookies/-/cookies-5.0.1.tgz"
-  integrity sha512-Is/kWBmYBFtX4DOImfglK5Bz2w3PdpgMGTqdVQSbZlFdSDw32lwFMk1mLSAzL5EcUEDwJJbcEATbU3JGSZSVXw==
-  dependencies:
-    invariant "^2.2.4"
-
 "@react-native-community/datetimepicker@3.4.3":
   version "3.4.3"
   resolved "https://registry.npmjs.org/@react-native-community/datetimepicker/-/datetimepicker-3.4.3.tgz"