Merge branch 'main' into IGAPP-1061-upgrade-react-and-react-native

digitalfabrik · Jan 31, 2023 · 7704e60 · 7704e60
2 parents f70cdc0 + 39a4e27
commit 7704e60
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/api-client/package.json b/api-client/package.json
@@ -16,7 +16,7 @@
     "lint:ci": "yarn run eslint --quiet --format junit -o reports/lint/junit-lint.xml",
     "ts:check": "tsc --build"
   },
-  "peerDependencies": {    
+  "peerDependencies": {
     "@types/react": "^18.0.26",
     "react": "18.2.0"
   },

diff --git a/api-client/src/models/PoiModel.ts b/api-client/src/models/PoiModel.ts
@@ -1,4 +1,6 @@
 import moment, { Moment } from 'moment'
+// Fix for minifying js issue with hermes using moment().locale https://github.com/moment/moment/issues/5789
+import 'moment/locale/de'
 
 import { mapMarker, PoiFeature } from '../maps'
 import ExtendedPageModel from './ExtendedPageModel'

diff --git a/e2e-tests/web/capabilities.ts b/e2e-tests/web/capabilities.ts
@@ -38,7 +38,7 @@ export const browserstackCapabilities = {
     browserName: 'Safari',
     browserVersion: '14.0',
   }),
-} as Record<typeof browsers[number], Capabilities>
+} as Record<(typeof browsers)[number], Capabilities>
 
 export const ciCapabilities = {
   browserName: 'chrome',

diff --git a/native/tsconfig.json b/native/tsconfig.json
@@ -20,7 +20,15 @@
     "typeRoots": ["./src/@types", "./node_modules/@types", "../node_modules/@types"],
     "types": ["jest", "node", "react-native", "styled-components-react-native"]
   },
-  "include": ["src/**/*", "./jest.setup.ts", "index.ts", "jest.config.ts", "metro.config.ci.js", "metro.config.js", "babel-jest.js"],
+  "include": [
+    "src/**/*",
+    "./jest.setup.ts",
+    "index.ts",
+    "jest.config.ts",
+    "metro.config.ci.js",
+    "metro.config.js",
+    "babel-jest.js"
+  ],
   "references": [
     {
       "path": "../translations"

diff --git a/release-notes/unreleased/IGAPP-1209-app-crashes-opening-hours.yaml b/release-notes/unreleased/IGAPP-1209-app-crashes-opening-hours.yaml
@@ -0,0 +1,7 @@
+issue_key: IGAPP-1209
+show_in_stores: true
+platforms:
+  - android
+  - ios
+en: Fix app crashes for places that are currently opened.
+de: App Abstürze bei gerade geöffneten Orten wurden behoben.
diff --git a/tools/constants.ts b/tools/constants.ts
@@ -12,7 +12,7 @@ const PLATFORMS = [PLATFORM_WEB, PLATFORM_IOS, PLATFORM_ANDROID]
 const MAIN_BRANCH = 'main'
 
 type ReleaseInformation = {
-  platform: typeof PLATFORMS[number]
+  platform: (typeof PLATFORMS)[number]
   versionName: string
 }
 const tagId = ({ platform, versionName }: ReleaseInformation): string => `${versionName}-${platform}`