From 1ca3373575b12c02b8de77b5f793339257fa3e63 Mon Sep 17 00:00:00 2001 From: naturexie <786281870@qq.com> Date: Sat, 12 Oct 2024 15:50:01 +0800 Subject: [PATCH] feat: add function key set --- package.json | 1 + styles/global.css | 6 ++++-- utils/wallet-selector-compat.ts | 23 ++++++++++++++++++++--- yarn.lock | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7f93a0b1..12fd52ea 100644 --- a/package.json +++ b/package.json @@ -93,6 +93,7 @@ "recharts": "^2.9.0", "redux": "^4.2.0", "redux-persist": "^6.0.0", + "ref-modal-ui": "^8.9.13", "remark-gfm": "^3.0.1", "rxjs": "^7.8.1", "serve": "^14.0.1", diff --git a/styles/global.css b/styles/global.css index 468bdfdd..52fcf37e 100644 --- a/styles/global.css +++ b/styles/global.css @@ -1,7 +1,7 @@ @tailwind base; @tailwind components; @tailwind utilities; -@import "../node_modules/@near-wallet-selector/modal-ui/styles.css"; +@import "../node_modules/ref-modal-ui/styles.css"; @font-face { font-family: "work-sans"; src: url("./work-sans/WorkSans-Regular.otf"); @@ -470,7 +470,9 @@ body, border-radius: 0; } } - +.nws-modal-wrapper .nws-modal .modal-left .modal-left-title { + background: #2e304b; +} input { margin: 0; background-color: transparent; diff --git a/utils/wallet-selector-compat.ts b/utils/wallet-selector-compat.ts index eb6f9049..38ebe84f 100644 --- a/utils/wallet-selector-compat.ts +++ b/utils/wallet-selector-compat.ts @@ -8,12 +8,12 @@ import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet"; import { setupWalletConnect } from "@near-wallet-selector/wallet-connect"; import { setupNeth } from "@near-wallet-selector/neth"; import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet"; -import { setupModal } from "@near-wallet-selector/modal-ui"; +import { setupModal } from "ref-modal-ui"; import { setupLedger } from "@near-wallet-selector/ledger"; import { setupMintbaseWallet } from "@near-wallet-selector/mintbase-wallet"; import { setupBitteWallet } from "@near-wallet-selector/bitte-wallet"; import { setupCoin98Wallet } from "@near-wallet-selector/coin98-wallet"; -import type { WalletSelectorModal } from "@near-wallet-selector/modal-ui"; +import type { WalletSelectorModal } from "ref-modal-ui"; import { Near } from "near-api-js/lib/near"; import { Account } from "near-api-js/lib/account"; import { BrowserLocalStorageKeyStore } from "near-api-js/lib/key_stores"; @@ -220,7 +220,24 @@ export const getWalletSelector = async ({ onAccountChange }: GetWalletSelectorAr } }); - const modal = setupModal(selector, { contractId: LOGIC_CONTRACT_NAME }); + const modal = setupModal(selector as any, { + contractId: LOGIC_CONTRACT_NAME, + blockFunctionKeyWallets: [ + "okx-wallet", + "my-near-wallet", + "meteor-wallet", + "neth", + "nightly", + "ledger", + "wallet-connect", + "keypom", + "mintbase-wallet", + "bitte-wallet", + "ethereum-wallets", + "sender", + "coin98-wallet", + ], + }); window.modal = modal; window.selectorSubscription = subscription; diff --git a/yarn.lock b/yarn.lock index 50d6703d..18d8acb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12758,6 +12758,15 @@ qrcode@1.5.3: pngjs "^5.0.0" yargs "^15.3.1" +qrcode@1.5.4: + version "1.5.4" + resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.4.tgz#5cb81d86eb57c675febb08cf007fff963405da88" + integrity sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg== + dependencies: + dijkstrajs "^1.0.1" + pngjs "^5.0.0" + yargs "^15.3.1" + qrcode@^1.4.4: version "1.5.1" resolved "https://registry.npmjs.org/qrcode/-/qrcode-1.5.1.tgz" @@ -13162,6 +13171,17 @@ redux@^4.0.0, redux@^4.1.2, redux@^4.2.0: dependencies: "@babel/runtime" "^7.9.2" +ref-modal-ui@^8.9.13: + version "8.9.13" + resolved "https://registry.yarnpkg.com/ref-modal-ui/-/ref-modal-ui-8.9.13.tgz#be0e81e1b6eb1d6e547639957dcf54ea1dbbf206" + integrity sha512-qelBsqRNl82TCIi4dgWXu+EYFakDfUwRudZMSLVPlvDtV6OpSe0xaEvCg1yCNxRficM0eMwt9yq5kGpcX1hjpw== + dependencies: + "@near-wallet-selector/core" "8.9.13" + copy-to-clipboard "3.3.3" + qrcode "1.5.4" + react "18.2.0" + react-dom "18.2.0" + regenerate-unicode-properties@^10.1.0: version "10.1.0" resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"