Skip to content

Commit

Permalink
feat: add openPageInDiscover
Browse files Browse the repository at this point in the history
  • Loading branch information
aelf-lxy committed Aug 1, 2024
1 parent 5ba0c9c commit 334ce3f
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: jaywcjlove/coverage-badges-cli@main
with:
source: packages/${{ matrix.package }}/coverage/coverage-summary.json
output: packages/${{ matrix.package }}/coverage/badge.svg
output: packages/${{ matrix.package }}/coverage/${{ matrix.package }}-badge.svg


- name: Deploy to GitHub Pages
Expand Down
2 changes: 1 addition & 1 deletion packages/base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aelf-web-login/wallet-adapter-base",
"version": "0.1.3-alpha.13",
"version": "0.1.3-alpha.14",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aelf-web-login/wallet-adapter-bridge",
"version": "0.1.3-alpha.13",
"version": "0.1.3-alpha.14",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aelf-web-login/wallet-adapter-react",
"version": "0.1.3-alpha.13",
"version": "0.1.3-alpha.14",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aelf-web-login/utils",
"version": "0.1.3-alpha.13",
"version": "0.1.3-alpha.14",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/night-elf/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aelf-web-login/wallet-adapter-night-elf",
"version": "0.1.3-alpha.13",
"version": "0.1.3-alpha.14",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/portkey-aa/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aelf-web-login/wallet-adapter-portkey-aa",
"version": "0.1.3-alpha.13",
"version": "0.1.3-alpha.14",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
5 changes: 3 additions & 2 deletions packages/wallets/portkey-discover/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aelf-web-login/wallet-adapter-portkey-discover",
"version": "0.1.3-alpha.13",
"version": "0.1.3-alpha.14",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand All @@ -25,11 +25,12 @@
"build": "father build"
},
"dependencies": {
"@aelf-web-login/wallet-adapter-base": "workspace:*",
"@aelf-web-login/utils": "workspace:*",
"@aelf-web-login/wallet-adapter-base": "workspace:*",
"@portkey/contracts": "^2.6.2",
"@portkey/detect-provider": "^2.2.0",
"@portkey/provider-types": "^2.2.0",
"@portkey/utils": "^2.4.5",
"bn.js": "^5.2.1"
},
"devDependencies": {
Expand Down
8 changes: 6 additions & 2 deletions packages/wallets/portkey-discover/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import { IContract } from '@portkey/types';

import detectDiscoverProvider from './detectProvider';
import checkSignatureParams from './signatureParams';
import { zeroFill } from './utils';
import { isPortkeyApp } from '@aelf-web-login/utils';
import { zeroFill, openPageInDiscover } from './utils';
import { isPortkeyApp, isMobileDevices } from '@aelf-web-login/utils';

type TDiscoverEventsKeys = Array<Exclude<DappEvents, 'connected' | 'message' | 'error'>>;

Expand Down Expand Up @@ -167,6 +167,10 @@ export class PortkeyDiscoverWallet extends BaseWalletAdapter {
}

async login(): Promise<TWalletInfo> {
if (isMobileDevices() && !isPortkeyApp()) {
openPageInDiscover(undefined, undefined);
return;
}
try {
if (!this._detectProvider) {
throw makeError(ERR_CODE.WITHOUT_DETECT_PROVIDER);
Expand Down
31 changes: 31 additions & 0 deletions packages/wallets/portkey-discover/src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,35 @@
import BN, { isBN } from 'bn.js';
import { scheme } from '@portkey/utils';

export function zeroFill(str: string | BN) {
return isBN(str) ? str.toString(16, 64) : str.padStart(64, '0');
}

export function openPageInDiscover(url?: string, version?: 'v1') {
try {
window.location.href = scheme.formatScheme({
action: 'linkDapp',
version,
domain: window.location.host,
custom: {
url: url || window.location.href,
},
});
const downloadUrl = 'https://portkey.finance/';
setTimeout(() => {
const hidden =
window.document.hidden ||
(window.document as any).mozHidden ||
(window.document as any).msHidden ||
(window.document as any).webkitHidden;
if (typeof hidden !== 'undefined' && hidden === true) {
return;
}
window.location.href = downloadUrl;
}, 2000);
} catch (error) {
// can‘t open app cannot go into this logic
console.error(error);
window.open('https://portkey.finance', '_blank');
}
}
16 changes: 10 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 334ce3f

Please sign in to comment.