From 02faac2782917de08395dce2ce23cd64019edd5b Mon Sep 17 00:00:00 2001 From: Samuel Elliott Date: Wed, 16 Oct 2024 00:18:24 +0100 Subject: [PATCH] Fix type errors --- src/api/f.ts | 2 +- src/api/na.ts | 6 +++--- src/app/browser/components/button.tsx | 4 ++++ src/app/browser/components/friend-code.tsx | 1 - src/app/browser/components/nintendo-switch-user.tsx | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/api/f.ts b/src/api/f.ts index f045818..72d74b0 100644 --- a/src/api/f.ts +++ b/src/api/f.ts @@ -236,7 +236,7 @@ export async function genf( if ('error' in data) { debugZncaApi('Error getting f parameter "%s"', data.error); - throw new ErrorResponse('[znca-api] ' + data.error_message ?? data.error, response, data); + throw new ErrorResponse('[znca-api] ' + (data.error_message ?? data.error), response, data); } debugZncaApi('Got f parameter', data, response.headers); diff --git a/src/api/na.ts b/src/api/na.ts index 9dcdcc1..b8480f8 100644 --- a/src/api/na.ts +++ b/src/api/na.ts @@ -133,7 +133,7 @@ export async function getNintendoAccountSessionToken(code: string, verifier: str const token = await response.json() as NintendoAccountSessionToken | NintendoAccountAuthError | NintendoAccountError; if ('error' in token) { - throw new NintendoAccountAuthErrorResponse('[na] ' + token.error_description ?? token.error, response, token); + throw new NintendoAccountAuthErrorResponse('[na] ' + (token.error_description ?? token.error), response, token); } if ('errorCode' in token) { throw new NintendoAccountErrorResponse('[na] ' + token.detail, response, token); @@ -170,8 +170,8 @@ export async function getNintendoAccountToken(token: string, client_id: string) const nintendoAccountToken = await response.json() as NintendoAccountToken | NintendoAccountAuthError | NintendoAccountError; if ('error' in nintendoAccountToken) { - throw new NintendoAccountAuthErrorResponse('[na] ' + nintendoAccountToken.error_description ?? - nintendoAccountToken.error, response, nintendoAccountToken); + throw new NintendoAccountAuthErrorResponse('[na] ' + (nintendoAccountToken.error_description ?? + nintendoAccountToken.error), response, nintendoAccountToken); } if ('errorCode' in nintendoAccountToken) { throw new NintendoAccountErrorResponse('[na] ' + nintendoAccountToken.detail, response, nintendoAccountToken); diff --git a/src/app/browser/components/button.tsx b/src/app/browser/components/button.tsx index ef1f810..3969b5f 100644 --- a/src/app/browser/components/button.tsx +++ b/src/app/browser/components/button.tsx @@ -56,6 +56,7 @@ function ButtonMac(props: { const styles_mac = StyleSheet.create({ button: { + // @ts-expect-error react-native-web cursor: 'default', lineHeight: 19, borderRadius: 3, @@ -63,6 +64,7 @@ const styles_mac = StyleSheet.create({ }, buttonLight: { backgroundColor: '#ffffff', + // @ts-expect-error react-native-web boxShadow: '#0000008a 0px 0px 1px', }, @@ -76,10 +78,12 @@ const styles_mac = StyleSheet.create({ }, innerActive: { backgroundColor: 'transparent', + // @ts-expect-error react-native-web backgroundImage: 'linear-gradient(0deg, #00000050, #00000040)', }, innerPressed: { backgroundColor: 'transparent', + // @ts-expect-error react-native-web backgroundImage: 'linear-gradient(0deg, #00000040, #00000020)', }, diff --git a/src/app/browser/components/friend-code.tsx b/src/app/browser/components/friend-code.tsx index a60fe88..75dcaef 100644 --- a/src/app/browser/components/friend-code.tsx +++ b/src/app/browser/components/friend-code.tsx @@ -27,7 +27,6 @@ export default function FriendCode(props: { const styles = StyleSheet.create({ friendCodeValue: { - // @ts-expect-error userSelect: 'all', }, }); diff --git a/src/app/browser/components/nintendo-switch-user.tsx b/src/app/browser/components/nintendo-switch-user.tsx index 9ec96f9..849c231 100644 --- a/src/app/browser/components/nintendo-switch-user.tsx +++ b/src/app/browser/components/nintendo-switch-user.tsx @@ -34,6 +34,7 @@ export function NintendoSwitchUsers(props: { const styles = StyleSheet.create({ userImage: { borderRadius: 8, - verticalAlign: -3, + // @ts-expect-error react-native-web + verticalAlign: -3 as 'auto', }, });