From 65c330e023af1f38be44ebab4b19d179b09aee9f Mon Sep 17 00:00:00 2001 From: Septs Date: Sat, 30 Apr 2022 16:08:21 +0800 Subject: [PATCH 1/3] chore: improve eslint rules --- .eslintrc.json | 6 ++++++ packages/mask/src/plugins/Avatar/Services/bind.ts | 8 +++----- .../mask/src/plugins/Tips/hooks/useTipsWalletsList.ts | 8 ++++---- .../plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx | 5 +++-- packages/theme/src/Components/Snackbar/index.tsx | 2 +- pnpm-lock.yaml | 2 +- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 59096d0cb027..38b157bf9e1e 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -20,6 +20,12 @@ "no-fallthrough": "error", "no-new-wrappers": "error", "no-plusplus": "error", + "valid-typeof": "error", + "no-loss-of-precision": "error", + "no-unsafe-optional-chaining": "error", + "no-unsafe-negation": "error", + "no-unsafe-finally": "error", + "no-irregular-whitespace": "error", "no-restricted-globals": ["error", "event", "name", "length", "closed"], "no-restricted-imports": [ "error", diff --git a/packages/mask/src/plugins/Avatar/Services/bind.ts b/packages/mask/src/plugins/Avatar/Services/bind.ts index c0df092a1ea0..af699bd59d86 100644 --- a/packages/mask/src/plugins/Avatar/Services/bind.ts +++ b/packages/mask/src/plugins/Avatar/Services/bind.ts @@ -89,7 +89,6 @@ export async function setUserAddress( await NFTAvatarDBStorage(network).set(userId, { [getKey(networkPluginId, chainId)]: address, }) - await NFTAvatarDB(network).set(userId, { networkPluginId: networkPluginId ?? NetworkPluginID.PLUGIN_EVM, chainId: chainId ?? ChainId.Mainnet, @@ -97,9 +96,8 @@ export async function setUserAddress( }) } catch { // do nothing - } finally { - const _address = await getUserAddress(userId, network, networkPluginId, chainId) - if (!isSameAddress(_address, address)) - throw new Error('Network issues, please make sure you are connected to the appropriate internet.') } + const userAddress = await getUserAddress(userId, network, networkPluginId, chainId) + if (isSameAddress(userAddress, address)) return + throw new Error('Network issues, please make sure you are connected to the appropriate internet.') } diff --git a/packages/mask/src/plugins/Tips/hooks/useTipsWalletsList.ts b/packages/mask/src/plugins/Tips/hooks/useTipsWalletsList.ts index 32d8a73d37bf..96a3f1abfaca 100644 --- a/packages/mask/src/plugins/Tips/hooks/useTipsWalletsList.ts +++ b/packages/mask/src/plugins/Tips/hooks/useTipsWalletsList.ts @@ -21,10 +21,10 @@ export function useTipsWalletsList( const result = proofs.reduce((res, x) => { x.isDefault = 0 x.isPublic = 1 - const temp = (kvCache?.content[PluginId.Tips]).filter((i) => isSameAddress(x.identity, i.identity)) - if (temp && temp.length > 0) { - x.isDefault = temp[0].isDefault - x.isPublic = temp[0].isPublic + const filtered = kvCache?.content[PluginId.Tips]?.find((proof) => isSameAddress(x.identity, proof.identity)) + if (filtered) { + x.isDefault = filtered.isDefault + x.isPublic = filtered.isPublic } res.push(x) return res diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx index 577ee9359008..06f25a243b13 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx @@ -68,10 +68,11 @@ export function TrendingPopper(props: TrendingPopperProps) { const position = useWindowScroll() useEffect(() => { if (!popper.current) return - const { top, height } = popper.current?.getBoundingClientRect() - if ((top < 0 && -1 * top > height) || top > document.documentElement.clientHeight) + const { top = Number.NaN, height = Number.NaN } = popper.current?.getBoundingClientRect() ?? {} + if ((top < 0 && -1 * top > height) || top > document.documentElement.clientHeight) { // out off bottom bound setAnchorEl(null) + } }, [popper, Math.floor(position.y / 50)]) // #endregion diff --git a/packages/theme/src/Components/Snackbar/index.tsx b/packages/theme/src/Components/Snackbar/index.tsx index dbd017e1e3db..008afbbf4f00 100644 --- a/packages/theme/src/Components/Snackbar/index.tsx +++ b/packages/theme/src/Components/Snackbar/index.tsx @@ -104,7 +104,7 @@ to { return { root: { zIndex: 9999, - transform: typeof offsetY !== undefined ? `translateY(${offsetY}px)` : 'none', + transform: typeof offsetY !== 'undefined' ? `translateY(${offsetY}px)` : 'none', color: MaskColorVar.textLight, pointerEvents: 'inherit', }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9cea8564a7c2..4339cc48f8e6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27647,7 +27647,7 @@ packages: dev: false github.com/locize/html-parse-stringify2/d463109433b2c49c74a081044f54b2a6a1ccad7c: - resolution: {tarball: https://codeload.github.com/locize/html-parse-stringify2/tar.gz/d463109433b2c49c74a081044f54b2a6a1ccad7c} + resolution: {commit: d463109433b2c49c74a081044f54b2a6a1ccad7c, repo: git+ssh://git@github.com/locize/html-parse-stringify2.git, type: git} name: html-parse-stringify2 version: 2.0.1 dependencies: From 95f2703406fbf32583591a8ca5c0eadc88d41b09 Mon Sep 17 00:00:00 2001 From: Septs Date: Sat, 30 Apr 2022 16:09:56 +0800 Subject: [PATCH 2/3] fix: variable name --- .../mask/src/plugins/Tips/hooks/useTipsWalletsList.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/mask/src/plugins/Tips/hooks/useTipsWalletsList.ts b/packages/mask/src/plugins/Tips/hooks/useTipsWalletsList.ts index 96a3f1abfaca..eb60dcb8551e 100644 --- a/packages/mask/src/plugins/Tips/hooks/useTipsWalletsList.ts +++ b/packages/mask/src/plugins/Tips/hooks/useTipsWalletsList.ts @@ -21,10 +21,10 @@ export function useTipsWalletsList( const result = proofs.reduce((res, x) => { x.isDefault = 0 x.isPublic = 1 - const filtered = kvCache?.content[PluginId.Tips]?.find((proof) => isSameAddress(x.identity, proof.identity)) - if (filtered) { - x.isDefault = filtered.isDefault - x.isPublic = filtered.isPublic + const matched = kvCache?.content[PluginId.Tips]?.find((proof) => isSameAddress(x.identity, proof.identity)) + if (matched) { + x.isDefault = matched.isDefault + x.isPublic = matched.isPublic } res.push(x) return res From 6bf426f7dc239493865d3b9cd026f8b29319ab20 Mon Sep 17 00:00:00 2001 From: Septs Date: Sat, 30 Apr 2022 16:13:14 +0800 Subject: [PATCH 3/3] revert: lockfile --- pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4339cc48f8e6..9cea8564a7c2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27647,7 +27647,7 @@ packages: dev: false github.com/locize/html-parse-stringify2/d463109433b2c49c74a081044f54b2a6a1ccad7c: - resolution: {commit: d463109433b2c49c74a081044f54b2a6a1ccad7c, repo: git+ssh://git@github.com/locize/html-parse-stringify2.git, type: git} + resolution: {tarball: https://codeload.github.com/locize/html-parse-stringify2/tar.gz/d463109433b2c49c74a081044f54b2a6a1ccad7c} name: html-parse-stringify2 version: 2.0.1 dependencies: