-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #88 from Portkey-Wallet/feature/guardians-without-…
…portkey-bot Support tg webapp
- Loading branch information
Showing
47 changed files
with
3,476 additions
and
145 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,11 @@ | ||
| const rewrites = require("./rewrites"); | ||
|
|
||
| /** @type {import('next').NextConfig} */ | ||
| const nextConfig = {} | ||
| const nextConfig = { | ||
| reactStrictMode: false, | ||
| async rewrites() { | ||
| return rewrites; | ||
| }, | ||
| }; | ||
|
|
||
| module.exports = nextConfig | ||
| module.exports = nextConfig; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| module.exports = [ | ||
| // test1 | ||
| // { source: '/api/:path*', destination: 'http://192.168.66.240:5577/api/:path*' }, | ||
| // { source: '/connect/:path*', destination: 'http://192.168.66.240:8080/connect/:path*' }, | ||
|
|
||
| // // test2 | ||
| // { source: '/api/:path*', destination: 'http://192.168.67.51:5577/api/:path*' }, | ||
| // { source: '/connect/:path*', destination: 'http://192.168.67.51:8080/connect/:path*' }, | ||
| // { source: '/graphql/:path*', destination: 'http://192.168.67.51:8083/AElfIndexer_DApp/PortKeyIndexerCASchema/graphql/:path*' }, | ||
|
|
||
| // test3 | ||
| // { source: '/api/:path*', destination: 'http://192.168.64.201:5001/api/:path*' }, | ||
| // { source: '/connect/:path*', destination: 'http://192.168.64.201:8080/connect/:path*' }, | ||
| // { source: '/graphql/:path*', destination: 'http://192.168.64.202:8083/AElfIndexer_DApp/PortKeyIndexerCASchema/graphql/:path*' }, | ||
|
|
||
| // test4-v2 | ||
| { source: '/api/:path*', destination: 'http://192.168.66.117:5577/api/:path*' }, | ||
| { source: '/communication/:path*', destination: 'http://192.168.66.117:5577/communication/:path*' }, | ||
| { source: '/connect/:path*', destination: 'http://192.168.66.117:8080/connect/:path*' }, | ||
| { | ||
| source: '/graphql/:path*', | ||
| destination: 'http://192.168.67.214:8083/AElfIndexer_DApp/PortKeyIndexerCASchema/graphql/:path*', | ||
| }, | ||
|
|
||
| // mainnet | ||
| // { source: '/api/:path*', destination: 'https://aa-portkey.portkey.finance/api/:path*' }, | ||
| // { source: '/connect/:path*', destination: 'https://auth-aa-portkey.portkey.finance/connect/:path*' }, | ||
| // { source: '/graphql/:path*', destination: 'https://dapp-aa-portkey.portkey.finance/Portkey_V2_DID/PortKeyIndexerCASchema/graphql/:path*' }, | ||
|
|
||
| // testnet | ||
| // { source: '/api/:path*', destination: 'https://aa-portkey-test.portkey.finance/api/:path*' }, | ||
| // { source: '/connect/:path*', destination: 'https://auth-aa-portkey-test.portkey.finance/connect/:path*' }, | ||
| // { | ||
| // source: '/graphql/:path*', | ||
| // destination: 'https://dapp-aa-portkey-test.portkey.finance/Portkey_V2_DID/PortKeyIndexerCASchema/graphql/:path*', | ||
| // }, | ||
| ]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| .guardian-approval-container { | ||
| position: relative; | ||
| height: 100vh; | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .ui-guardian-approval-wrapper { | ||
| flex: 1; | ||
| .guardian-list-wrapper { | ||
| padding: 96px 24px 24px; | ||
| } | ||
| } | ||
|
|
||
| .loading-wrapper { | ||
| position: absolute; | ||
| top: 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| "use client"; | ||
| import { | ||
| errorTip, | ||
| GuardianApproval as GuardianApprovalComponent, | ||
| handleErrorMessage, | ||
| PortkeyStyleProvider, | ||
| } from "@portkey/did-ui-react"; | ||
| import type { ITelegramInfo, UserGuardianStatus } from "@portkey/did-ui-react"; | ||
| import { OperationTypeEnum, GuardiansApproved } from "@portkey/services"; | ||
| import { useCallback, useEffect, useMemo, useState } from "react"; | ||
| import Loading from "src/components/Loading"; | ||
| import { formatGuardianValue, getGuardianList } from "src/utils/guardians"; | ||
| import { getOperationDetails } from "src/utils/manager"; | ||
| import { useSearchParams } from "next/navigation"; | ||
| import "@portkey/did-ui-react/dist/assets/index.css"; | ||
| import "./index.css"; | ||
| import { GuardianApprovalLocationState } from "src/types/guardians"; | ||
| import { base64toJSON } from "src/utils"; | ||
| import { DefaultGuardianApprovalLocationState } from "src/constants/guardians"; | ||
| import { | ||
| CrossTabPushMessageType, | ||
| pushEncodeMessage, | ||
| } from "src/utils/crossTabMessagePush"; | ||
| import PoweredFooter from "src/components/PoweredFooter"; | ||
|
|
||
| export default function GuardianApproval() { | ||
| const searchParams = useSearchParams(); | ||
|
|
||
| // search params | ||
| const b64Params = searchParams.get("b64Params") || ""; | ||
| const pageInfo: GuardianApprovalLocationState = useMemo(() => { | ||
| try { | ||
| const data = base64toJSON(b64Params); | ||
| console.log(data, "b64Params==="); | ||
| return data as GuardianApprovalLocationState; | ||
| } catch (error) { | ||
| return DefaultGuardianApprovalLocationState; | ||
| } | ||
| }, [b64Params]); | ||
| const operationType = useMemo( | ||
| () => Number(pageInfo.operationType) as OperationTypeEnum, | ||
| [pageInfo] | ||
| ); | ||
| const sessionAuth = useMemo( | ||
| () => | ||
| JSON.stringify({ | ||
| loginId: pageInfo.loginId, | ||
| publicKey: pageInfo.publicKey, | ||
| serviceURI: | ||
| pageInfo.serviceURI || "https://aa-portkey-test.portkey.finance", | ||
| }), | ||
| [pageInfo.loginId, pageInfo.publicKey, pageInfo.serviceURI] | ||
| ); | ||
|
|
||
| // page state | ||
| const [loading, setLoading] = useState(false); | ||
| const operationDetails = getOperationDetails(operationType); | ||
| const [guardianList, setGuardianList] = useState<UserGuardianStatus[]>(); | ||
| const telegramInfo: ITelegramInfo = useMemo(() => { | ||
| return { | ||
| accessToken: pageInfo.telegramAuth, | ||
| userId: pageInfo.telegramUserId, | ||
| }; | ||
| }, [pageInfo.telegramAuth, pageInfo.telegramUserId]); | ||
|
|
||
| const getData = useCallback(async () => { | ||
| setLoading(true); | ||
| try { | ||
| const _guardianList = await getGuardianList({ | ||
| identifier: pageInfo.identifier, | ||
| caHash: pageInfo.caHash, | ||
| originChainId: pageInfo.originChainId, | ||
| }); | ||
| _guardianList.reverse(); | ||
| setGuardianList(_guardianList); | ||
| return _guardianList; | ||
| } catch (error) { | ||
| errorTip( | ||
| { | ||
| errorFields: "GetGuardianList", | ||
| error: handleErrorMessage(error), | ||
| }, | ||
| pageInfo.isErrorTip | ||
| // onApprovalError | ||
| ); | ||
| } finally { | ||
| setLoading(false); | ||
| } | ||
| }, [ | ||
| pageInfo.caHash, | ||
| pageInfo.identifier, | ||
| pageInfo.isErrorTip, | ||
| pageInfo.originChainId, | ||
| ]); | ||
|
|
||
| const onApprovalSuccess = useCallback( | ||
| async (approvalInfo: GuardiansApproved[]) => { | ||
| const formatGuardiansApproved = formatGuardianValue(approvalInfo); | ||
|
|
||
| // save data | ||
| // back dapp webapp to execute the next step of the process | ||
| if (sessionAuth) { | ||
| await pushEncodeMessage( | ||
| sessionAuth, | ||
| pageInfo.socketMethod || | ||
| CrossTabPushMessageType.onGuardianApprovalResult, | ||
| JSON.stringify({ approvalInfo, formatGuardiansApproved }), | ||
| true | ||
| ); | ||
| return; | ||
| } | ||
| }, | ||
| [pageInfo.socketMethod, sessionAuth] | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| getData(); | ||
| }, [getData]); | ||
|
|
||
| return ( | ||
| <PortkeyStyleProvider> | ||
| <div className="guardian-approval-container"> | ||
| <GuardianApprovalComponent | ||
| // header={<BackHeaderForPage title={""} leftElement={""} />} | ||
| operationDetails={operationDetails} | ||
| originChainId={pageInfo.originChainId} | ||
| targetChainId={pageInfo.targetChainId} | ||
| guardianList={guardianList} | ||
| onConfirm={onApprovalSuccess} | ||
| // onError={onApprovalError} | ||
| networkType={pageInfo.networkType} | ||
| operationType={operationType} | ||
| telegramInfo={telegramInfo} | ||
| /> | ||
| <PoweredFooter /> | ||
| <Loading loading={loading} /> | ||
| </div> | ||
| </PortkeyStyleProvider> | ||
| ); | ||
| } |
Oops, something went wrong.