History

fix(mobile): repair Clerk auth navigation headers (#5140)

Gabriel De Andrade committed 3 months ago

Commit af281c91 parent bd422fd3 files · +48 −46Browse files

Unified · Split

3 files
  1. apps/mobile/src/features/settings/SettingsAuthRouteScreen.tsx +6 −4
  2. pnpm-lock.yaml +34 −34
  3. pnpm-workspace.yaml +8 −8
apps/mobile/src/features/settings/SettingsAuthRouteScreen.tsx+6−4
@@ -2,7 +2,7 @@ import { useAuth } from "@clerk/expo"; · 1 unmodified line
22 import { AuthView, UserProfileView } from "@clerk/expo/native";
33 import { StackActions, useNavigation } from "@react-navigation/native";
44 import { NativeStackScreenOptions } from "../../native/StackHeader";
5−import { useEffect } from "react";
5+import { useCallback, useEffect } from "react";
66 import { View } from "react-native";
77
88 import { hasCloudPublicConfig } from "../cloud/publicConfig";
@@ -21,16 +21,18 @@ export function SettingsAuthRouteScreen() { · 12 unmodified lines
2121
2222 function ConfiguredSettingsAuthRouteScreen() {
2323 const { isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
24+ const navigation = useNavigation();
25+ const handleHostBack = useCallback(() => navigation.goBack(), [navigation]);
2426
2527 return (
2628 <>
27− <NativeStackScreenOptions options={{ title: isSignedIn ? "Account" : "Sign in" }} />
29+ <NativeStackScreenOptions options={{ headerShown: false }} />
2830 <View collapsable={false} className="flex-1 overflow-hidden bg-sheet">
2931 {isLoaded ? (
3032 isSignedIn ? (
31− <UserProfileView isDismissible={false} />
33+ <UserProfileView isDismissible={false} onHostBack={handleHostBack} />
3234 ) : (
33− <AuthView isDismissible={false} />
35+ <AuthView isDismissible={false} onHostBack={handleHostBack} />
3436 )
3537 ) : null}
3638 </View>
pnpm-lock.yaml+34−34
@@ -36,7 +36,7 @@ catalogs: · 35 unmodified lines
3636
3737 overrides:
3838 '@clerk/backend': 3.14.0
39− '@clerk/clerk-js': 6.25.12
39+ '@clerk/clerk-js': 6.25.13
4040 '@clerk/clerk-js>@base-org/account': '-'
4141 '@clerk/clerk-js>@coinbase/wallet-sdk': '-'
4242 '@clerk/clerk-js>@solana/wallet-adapter-base': '-'
@@ -45,9 +45,9 @@ overrides: · 2 unmodified lines
4545 '@clerk/clerk-js>@wallet-standard/core': '-'
4646 '@clerk/electron': 0.0.24
4747 '@clerk/electron-passkeys': 0.0.3
48− '@clerk/expo': 4.1.2
49− '@clerk/react': 6.12.9
50− '@clerk/shared': 4.25.9
48+ '@clerk/expo': 4.2.0
49+ '@clerk/react': 6.12.10
50+ '@clerk/shared': 4.25.10
5151 '@effect/atom-react': 4.0.0-beta.103
5252 '@effect/platform-bun': 4.0.0-beta.103
5353 '@effect/platform-node': 4.0.0-beta.103
@@ -196,8 +196,8 @@ importers: · 142 unmodified lines
196196 specifier: ^0.7.1
197197 version: 0.7.1(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
198198 '@clerk/expo':
199− specifier: 4.1.2
200− version: 4.1.2(expo-auth-session@56.0.14(expo@56.0.12)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo-constants@56.0.18)(expo-crypto@56.0.4(expo@56.0.12))(expo-secure-store@56.0.4(expo@56.0.12))(expo-web-browser@56.0.5(expo@56.0.12)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.12)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
199+ specifier: 4.2.0
200+ version: 4.2.0(expo-auth-session@56.0.14(expo@56.0.12)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo-constants@56.0.18)(expo-crypto@56.0.4(expo@56.0.12))(expo-secure-store@56.0.4(expo@56.0.12))(expo-web-browser@56.0.5(expo@56.0.12)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.12)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)
201201 '@effect/atom-react':
202202 specifier: 4.0.0-beta.103
203203 version: 4.0.0-beta.103(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(react@19.2.3)(scheduler@0.27.0)
@@ -516,8 +516,8 @@ importers: · 312 unmodified lines
516516 specifier: 0.0.24
517517 version: 0.0.24(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@41.5.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
518518 '@clerk/react':
519− specifier: 6.12.9
520− version: 6.12.9(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
519+ specifier: 6.12.10
520+ version: 6.12.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
521521 '@dnd-kit/core':
522522 specifier: ^6.3.1
523523 version: 6.3.1(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -1692,8 +1692,8 @@ packages: · 1168 unmodified lines
16921692 resolution: {integrity: sha512-WsphTvDFHDuQilKI7dyVE5qmt7USu8qSrujAq6SqpEHbVFfNBfINDNuzxlF9M2skOTfHFfgiTE8Jjb1egIBGLg==}
16931693 engines: {node: '>=20.9.0'}
16941694
1695− '@clerk/clerk-js@6.25.12':
1696− resolution: {integrity: sha512-N91mFKenMF5e+LRQ0NsqFb8bw+icbwnF8MzjzS4cux72xG4Gekh772tiLIetbURe44Srgjw5lj8jkWbt+yH/FA==}
1695+ '@clerk/clerk-js@6.25.13':
1696+ resolution: {integrity: sha512-QXhNzo0BjVSEItBsj9ukreofsi9XSrR5OJpB03ZDMb0QwWB5oXDHBBukC7DyHNmWt+dNHq01k4XUmA6cCvnNjA==}
16971697 engines: {node: '>=20.9.0'}
16981698
16991699 '@clerk/electron-passkeys-darwin-arm64@0.0.3':
@@ -1737,8 +1737,8 @@ packages: · 37 unmodified lines
17371737 react-dom:
17381738 optional: true
17391739
1740− '@clerk/expo@4.1.2':
1741− resolution: {integrity: sha512-ZyGozbbizcGwEyK0CEXsPHnHnQoaa2CbTsXAqWBygzKEZyFjLjCHwQsQBKj6WgjAgn8mtw2ByIP9qLpItZffgw==}
1740+ '@clerk/expo@4.2.0':
1741+ resolution: {integrity: sha512-S2TYZn1Tltm/gXfe9J1NCuLRCmQX/3gfD0c+i/B1RWGbIJpSZX7KGRzvW70ABaqrK9IUcribLVmMN6unmpuCtQ==}
17421742 engines: {node: '>=20.9.0'}
17431743 peerDependencies:
17441744 '@clerk/expo-google-signin': '>=0.1.0'
@@ -1776,15 +1776,15 @@ packages: · 31 unmodified lines
17761776 react-dom:
17771777 optional: true
17781778
1779− '@clerk/react@6.12.9':
1780− resolution: {integrity: sha512-lQ1UOJhHGDweLCDf4IgT5r3rgkch1Gx21hNqK2/kOohJrJd/XM89fq2F7VK9Kg/Byc14TsfCh64Dm8ej2MyRWw==}
1779+ '@clerk/react@6.12.10':
1780+ resolution: {integrity: sha512-VDYyCyzRdMsNW6qQsMp1+L2VOXxFwpLfWBxOWPvUNOYCruecnAZjUYEJWS+E+i5MAPhSew9HjuweS4bO0FclTQ==}
17811781 engines: {node: '>=20.9.0'}
17821782 peerDependencies:
17831783 react: ^18.0.0 || ~19.0.3 || ~19.1.4 || ~19.2.3 || ~19.3.0-0
17841784 react-dom: ^18.0.0 || ~19.0.3 || ~19.1.4 || ~19.2.3 || ~19.3.0-0
17851785
1786− '@clerk/shared@4.25.9':
1787− resolution: {integrity: sha512-nw3maGzqPrwmUKjGffOM9Zvw24IyOllq0TkQGzsTfQX312WLu2u5CNvjKntMb6Ok6kXa1Zdc77zmPLn1/EAIFA==}
1786+ '@clerk/shared@4.25.10':
1787+ resolution: {integrity: sha512-Vjqk74nQGJ8y+cm+eSshoBzRvBhIzuKLOs3Gt13gEHdyQ6yV798Dl2SrBKt0jw2u6I1tOcD3s8/i9P4yJYo0dw==}
17881788 engines: {node: '>=20.9.0'}
17891789 peerDependencies:
17901790 react: ^18.0.0 || ~19.0.3 || ~19.1.4 || ~19.2.3 || ~19.3.0-0
@@ -11511,16 +11511,16 @@ snapshots: · 9720 unmodified lines
1151111511
1151211512 '@clerk/backend@3.14.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
1151311513 dependencies:
11514− '@clerk/shared': 4.25.9(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
11514+ '@clerk/shared': 4.25.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
1151511515 standardwebhooks: 1.0.0
1151611516 tslib: 2.8.1
1151711517 transitivePeerDependencies:
1151811518 - react
1151911519 - react-dom
1152011520
11521− '@clerk/clerk-js@6.25.12(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
11521+ '@clerk/clerk-js@6.25.13(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
1152211522 dependencies:
11523− '@clerk/shared': 4.25.9(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
11523+ '@clerk/shared': 4.25.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
1152411524 '@stripe/stripe-js': 5.6.0
1152511525 '@swc/helpers': 0.5.21
1152611526 '@tanstack/query-core': 5.100.14
@@ -11535,9 +11535,9 @@ snapshots: · 8 unmodified lines
1153511535 - react
1153611536 - react-dom
1153711537
11538− '@clerk/clerk-js@6.25.12(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
11538+ '@clerk/clerk-js@6.25.13(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
1153911539 dependencies:
11540− '@clerk/shared': 4.25.9(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
11540+ '@clerk/shared': 4.25.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
1154111541 '@stripe/stripe-js': 5.6.0
1154211542 '@swc/helpers': 0.5.21
1154311543 '@tanstack/query-core': 5.100.14
@@ -11573,9 +11573,9 @@ snapshots: · 29 unmodified lines
1157311573
1157411574 '@clerk/electron@0.0.24(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@41.5.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
1157511575 dependencies:
11576− '@clerk/clerk-js': 6.25.12(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
11577− '@clerk/react': 6.12.9(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
11578− '@clerk/shared': 4.25.9(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
11576+ '@clerk/clerk-js': 6.25.13(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
11577+ '@clerk/react': 6.12.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
11578+ '@clerk/shared': 4.25.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
1157911579 electron: 41.5.0
1158011580 react: 19.2.6
1158111581 tslib: 2.8.1
@@ -11584,11 +11584,11 @@ snapshots: · 2 unmodified lines
1158411584 electron-store: 8.2.0
1158511585 react-dom: 19.2.6(react@19.2.6)
1158611586
11587− '@clerk/expo@4.1.2(expo-auth-session@56.0.14(expo@56.0.12)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo-constants@56.0.18)(expo-crypto@56.0.4(expo@56.0.12))(expo-secure-store@56.0.4(expo@56.0.12))(expo-web-browser@56.0.5(expo@56.0.12)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.12)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)':
11587+ '@clerk/expo@4.2.0(expo-auth-session@56.0.14(expo@56.0.12)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo-constants@56.0.18)(expo-crypto@56.0.4(expo@56.0.12))(expo-secure-store@56.0.4(expo@56.0.12))(expo-web-browser@56.0.5(expo@56.0.12)(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)))(expo@56.0.12)(react-dom@19.2.3(react@19.2.3))(react-native@0.85.3(@babel/core@7.29.7)(@react-native/metro-config@0.85.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(typescript@6.0.3)':
1158811588 dependencies:
11589− '@clerk/clerk-js': 6.25.12(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
11590− '@clerk/react': 6.12.9(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
11591− '@clerk/shared': 4.25.9(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
11589+ '@clerk/clerk-js': 6.25.13(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
11590+ '@clerk/react': 6.12.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
11591+ '@clerk/shared': 4.25.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
1159211592 '@expo/config-plugins': 56.0.9(typescript@6.0.3)
1159311593 base-64: 1.0.0
1159411594 expo: 56.0.12(8895228379997a2a064f9644cda56ed0)
@@ -11607,21 +11607,21 @@ snapshots: · 12 unmodified lines
1160711607 - supports-color
1160811608 - typescript
1160911609
11610− '@clerk/react@6.12.9(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
11610+ '@clerk/react@6.12.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
1161111611 dependencies:
11612− '@clerk/shared': 4.25.9(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
11612+ '@clerk/shared': 4.25.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
1161311613 react: 19.2.3
1161411614 react-dom: 19.2.3(react@19.2.3)
1161511615 tslib: 2.8.1
1161611616
11617− '@clerk/react@6.12.9(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
11617+ '@clerk/react@6.12.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
1161811618 dependencies:
11619− '@clerk/shared': 4.25.9(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
11619+ '@clerk/shared': 4.25.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
1162011620 react: 19.2.6
1162111621 react-dom: 19.2.6(react@19.2.6)
1162211622 tslib: 2.8.1
1162311623
11624− '@clerk/shared@4.25.9(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
11624+ '@clerk/shared@4.25.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
1162511625 dependencies:
1162611626 '@tanstack/query-core': 5.100.14
1162711627 dequal: 2.0.3
@@ -11631,7 +11631,7 @@ snapshots: · 3 unmodified lines
1163111631 react: 19.2.3
1163211632 react-dom: 19.2.3(react@19.2.3)
1163311633
11634− '@clerk/shared@4.25.9(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
11634+ '@clerk/shared@4.25.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
1163511635 dependencies:
1163611636 '@tanstack/query-core': 5.100.14
1163711637 dequal: 2.0.3
pnpm-workspace.yaml+8−8
@@ -24,12 +24,12 @@ allowBuilds: · 23 unmodified lines
2424
2525 catalog:
2626 "@clerk/backend": 3.14.0
27− "@clerk/clerk-js": 6.25.12
27+ "@clerk/clerk-js": 6.25.13
2828 "@clerk/electron": 0.0.24
2929 "@clerk/electron-passkeys": 0.0.3
30− "@clerk/expo": 4.1.2
31− "@clerk/react": 6.12.9
32− "@clerk/shared": 4.25.9
30+ "@clerk/expo": 4.2.0
31+ "@clerk/react": 6.12.10
32+ "@clerk/shared": 4.25.10
3333 "@effect/atom-react": 4.0.0-beta.103
3434 "@effect/openapi-generator": 4.0.0-beta.103
3535 "@effect/platform-bun": 4.0.0-beta.103
@@ -53,11 +53,11 @@ catalog: · 17 unmodified lines
5353
5454 minimumReleaseAgeExclude:
5555 - "@clerk/backend@3.14.0"
56− - "@clerk/clerk-js@6.25.12"
56+ - "@clerk/clerk-js@6.25.13"
5757 - "@clerk/electron@0.0.24"
58− - "@clerk/expo@4.1.2"
59− - "@clerk/react@6.12.9"
60− - "@clerk/shared@4.25.9"
58+ - "@clerk/expo@4.2.0"
59+ - "@clerk/react@6.12.10"
60+ - "@clerk/shared@4.25.10"
6161 - "@distilled.cloud/aws@0.30.2"
6262 - "@distilled.cloud/axiom@0.30.2"
6363 - "@distilled.cloud/cloudflare@0.30.2"