File tree 3 files changed +14
-5
lines changed
3 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -98,14 +98,14 @@ export default function LoginInfo(): JSX.Element {
98
98
const { bottom} = useSafeAreaInsets ( ) ;
99
99
const { signOut} = useAuth ( ) ;
100
100
const { isSignedIn, user} = useUser ( ) ;
101
- const [ { pushToken} , setAuth ] = useRecoilState ( authRecoilState ) ;
101
+ const [ { pushToken, authId } , setAuth ] = useRecoilState ( authRecoilState ) ;
102
102
103
103
const handleSignOut = async ( ) : Promise < void > => {
104
104
if ( isSignedIn && supabase ) {
105
- if ( pushToken && user ?. id ) {
105
+ if ( pushToken && authId ) {
106
106
await fetchDeletePushToken ( {
107
107
supabase,
108
- authId : user ?. id ,
108
+ authId,
109
109
expoPushToken : pushToken ,
110
110
} ) ;
111
111
}
Original file line number Diff line number Diff line change @@ -17,6 +17,15 @@ export default function Unmatched(): JSX.Element {
17
17
const pathname = usePathname ( ) ;
18
18
19
19
useEffect ( ( ) => {
20
+ // Fix android clerk sign-in done bug
21
+ if ( pathname === '/oauth-native-callback' ) {
22
+ if ( canGoBack ( ) ) {
23
+ back ( ) ;
24
+ }
25
+
26
+ replace ( '/' ) ;
27
+ }
28
+
20
29
// Fix ios new install bug
21
30
if ( pathname === '/google/link' ) {
22
31
if ( canGoBack ( ) ) {
Original file line number Diff line number Diff line change @@ -154,7 +154,7 @@ function App(): JSX.Element | null {
154
154
}
155
155
156
156
const blockedUserIds = await fetchBlockUserIds ( {
157
- userId : user . id ,
157
+ userId : profile . id ,
158
158
supabase,
159
159
} ) ;
160
160
@@ -174,7 +174,7 @@ function App(): JSX.Element | null {
174
174
} ) ) ;
175
175
176
176
fetchAddPushToken ( {
177
- authId : user . id ,
177
+ authId : profile . id ,
178
178
expoPushToken : token ,
179
179
supabase,
180
180
} ) ;
You can’t perform that action at this time.
0 commit comments