Merge branch 'develop' into refactor/improved-update-convenience

misskey-dev · Jun 20, 2024 · 2969a67 · 2969a67
2 parents ea10638 + b683d79
commit 2969a67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts
@@ -120,7 +120,7 @@ function fetchAccount(token: string, id?: string, forceShowDialog?: boolean): Pr
 				res.json().then(done2, fail2);
 			}))
 			.then(async res => {
-				if (res.error) {
+				if ('error' in res) {
 					if (res.error.id === 'a8c724b3-6e9c-4b46-b1a8-bc3ed6258370') {
 						// SUSPENDED
 						if (forceShowDialog || $i && (token === $i.token || id === $i.id)) {

diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json
@@ -37,7 +37,8 @@
 		],
 		"lib": [
 			"esnext",
-			"dom"
+			"dom",
+			"dom.iterable"
 		],
 		"jsx": "preserve"
 	},