fixup! chore(origins): include xoauth origins when requesting permissions (#12315) (#12316)

Author: swkatmask

packages/mask/dashboard/pages/SetupPersona/Onboarding/index.tsx

@@ -1,22 +1,22 @@
-import { memo, useCallback, useEffect, useMemo } from 'react'
-import { Box, Typography, useTheme } from '@mui/material'
-import { SetupFrameController } from '../../../components/SetupFrame/index.js'
-import { PrimaryButton } from '../../../components/PrimaryButton/index.js'
-import { makeStyles, useCustomSnackbar } from '@masknet/theme'
 import { Icons } from '@masknet/icons'
-import { Trend } from '../../../assets/index.js'
 import { CrossIsolationMessages, EnhanceableSite, PopupRoutes, userGuideStatus } from '@masknet/shared-base'
+import { makeStyles, useCustomSnackbar } from '@masknet/theme'
+import { Box, Typography } from '@mui/material'
+import { memo, useCallback, useEffect, useMemo } from 'react'
+import { Trend } from '../../../assets/index.js'
+import { PrimaryButton } from '../../../components/PrimaryButton/index.js'
+import { SetupFrameController } from '../../../components/SetupFrame/index.js'
 
 import Services from '#services'
+import { plural } from '@lingui/core/macro'
+import { Trans, useLingui } from '@lingui/react/macro'
 import { delay } from '@masknet/kit'
-import { OnboardingWriter } from '../../../components/OnboardingWriter/index.js'
-import { useSearchParams } from 'react-router-dom'
 import { isZero } from '@masknet/web3-shared-base'
+import { useSearchParams } from 'react-router-dom'
 import { useAsyncRetry } from 'react-use'
-import { TwitterAdaptor } from '../../../../shared/site-adaptors/implementations/twitter.com.js'
 import { requestPermissionFromExtensionPage } from '../../../../shared-ui/index.js'
-import { Trans, useLingui } from '@lingui/react/macro'
-import { plural } from '@lingui/core/macro'
+import { TwitterAdaptor } from '../../../../shared/site-adaptors/implementations/twitter.com.js'
+import { OnboardingWriter } from '../../../components/OnboardingWriter/index.js'
 
 const useStyles = makeStyles()((theme) => ({
     card: {
@@ -81,7 +81,6 @@ export const Component = memo(function Onboarding() {
 
     const [params] = useSearchParams()
     const { showSnackbar } = useCustomSnackbar()
-    const theme = useTheme()
     const isCreate = params.get('isCreate')
     const count = params.get('count')
     const { value: hasPaymentPassword, loading, retry } = useAsyncRetry(Services.Wallet.hasPassword, [])

packages/mask/dashboard/pages/SetupPersona/Welcome/index.tsx

@@ -14,6 +14,7 @@ import { SecondaryButton } from '../../../components/SecondaryButton/index.js'
 import { SetupFrameController } from '../../../components/SetupFrame/index.js'
 import { TermsAgreedContext } from '../../../hooks/useTermsAgreed.js'
 import { Article } from './Article.js'
+import { XOAuthRequestOrigins } from '../../../../shared/definitions/extension.js'
 
 const useStyles = makeStyles()((theme) => ({
     title: {
@@ -65,9 +66,8 @@ export const Component = memo(function Welcome() {
         setAgreed(true)
 
         try {
-            const granted = await requestPermissionFromExtensionPage(
-                [...definedSiteAdaptors.values()].flatMap((x) => x.declarativePermissions.origins),
-            )
+            const siteOrigins = [...definedSiteAdaptors.values()].flatMap((x) => x.declarativePermissions.origins)
+            const granted = await requestPermissionFromExtensionPage([...siteOrigins, ...XOAuthRequestOrigins])
             if (!granted) return
             if (!userGuideStatus[EnhanceableSite.Twitter].value) userGuideStatus[EnhanceableSite.Twitter].value = '1'
         } catch (err) {