diff --git a/LICENSE b/LICENSE index fb9dbf0..d7a7072 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 PotLock +Copyright (c) 2024 Potluck Labs, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 84bc7bb..3fc6eda 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ NEXT_PUBLIC_NETWORK=testnet # The smart contract ID (ID of the account where the contract was deployed) # testnet: v1.nadabot.testnet -# staging: v1.staging.nadabot.near +# staging: v2new.staging.nadabot.near # mainnet: v1.nadabot.near NEXT_PUBLIC_CONTRACT_NAME= diff --git a/components/pages/home/ChecksSection.tsx b/components/pages/home/ChecksSection.tsx index dda8600..90a5607 100644 --- a/components/pages/home/ChecksSection.tsx +++ b/components/pages/home/ChecksSection.tsx @@ -1,12 +1,15 @@ import { Stack, Typography } from "@mui/material"; -import { useRouter } from "next/router"; -import { useCallback, useState } from "react"; +// import { useRouter } from "next/router"; +import { + // useCallback, + useState, +} from "react"; -import CustomButton from "@nadabot/components/ui/CustomButton"; +// import CustomButton from "@nadabot/components/ui/CustomButton"; import { useUser } from "@nadabot/hooks/store/useUser"; import useBreakPoints from "@nadabot/hooks/useBreakPoints"; import useFilteredProviders from "@nadabot/hooks/useFilteredProviders"; -import { Routes } from "@nadabot/routes"; +// import { Routes } from "@nadabot/routes"; import colors from "@nadabot/theme/colors"; import providerSorts from "@nadabot/utils/providerSorts"; @@ -15,7 +18,7 @@ import { ShadowContainer } from "../../containers/ShadowContainer"; import { AddFilterSearchInput } from "../../ui/AddFilterSearchInput"; export default function ChecksSection() { - const router = useRouter(); + // const router = useRouter(); const { walletConnected } = useUser(); const { maxWidth805 } = useBreakPoints(); const [searchPattern, setSearchPattern] = useState(""); @@ -23,9 +26,9 @@ export default function ChecksSection() { sortMethod: providerSorts.higherWeightFirst, }); - const addCustomCheckHandler = useCallback(() => { - router.push(Routes.ADD_STAMP); - }, [router]); + // const addCustomCheckHandler = useCallback(() => { + // router.push(Routes.ADD_STAMP); + // }, [router]); const providers = walletConnected && activeNoHuman.length > 0 ? activeNoHuman : active; @@ -49,7 +52,7 @@ export default function ChecksSection() { human. - {walletConnected && ( + {/* {walletConnected && ( + Add Custom Check - )} + )} */} {/* Checks Container */} diff --git a/package-lock.json b/package-lock.json index 03e1fb5..e81d71d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,14 +21,16 @@ "@near-wallet-selector/meteor-wallet": "^8.9.5", "@near-wallet-selector/mintbase-wallet": "^8.9.5", "@near-wallet-selector/modal-ui": "^8.9.2", + "@near-wallet-selector/my-near-wallet": "^8.9.6", "@near-wallet-selector/near-mobile-wallet": "^8.9.5", "@near-wallet-selector/nearfi": "^8.9.5", "@near-wallet-selector/neth": "^8.9.5", + "@near-wallet-selector/nightly": "^8.9.6", "@near-wallet-selector/sender": "^8.5.0", "@near-wallet-selector/welldone-wallet": "^8.9.5", "@near-wallet-selector/xdefi": "^8.9.5", "@uidotdev/usehooks": "^2.4.1", - "@wpdas/naxios": "^2.0.1", + "@wpdas/naxios": "^2.1.0", "copy-to-clipboard": "^3.3.3", "formik": "^2.4.5", "fuse.js": "^7.0.0", @@ -2119,21 +2121,21 @@ } }, "node_modules/@near-wallet-selector/my-near-wallet": { - "version": "8.9.5", - "resolved": "https://registry.npmjs.org/@near-wallet-selector/my-near-wallet/-/my-near-wallet-8.9.5.tgz", - "integrity": "sha512-oX/l0jaj73Vg3fIoAqRs8paZ83wBhtbjtNWtak8CaQ3SOtJjKd8RH58kbPaoxSPa+KqqNbC1J7V2WtdVC0leGQ==", + "version": "8.9.6", + "resolved": "https://registry.npmjs.org/@near-wallet-selector/my-near-wallet/-/my-near-wallet-8.9.6.tgz", + "integrity": "sha512-CVaMtaUZLdfQZXl0qGeX0ae7CB+reMgPMk4UIKKXOdSwkSChcIwQB6BDZJmgzzU/NRgpBDXZTVjFr33Pp2qPHg==", "dependencies": { - "@near-wallet-selector/core": "8.9.5", - "@near-wallet-selector/wallet-utils": "8.9.5" + "@near-wallet-selector/core": "8.9.6", + "@near-wallet-selector/wallet-utils": "8.9.6" }, "peerDependencies": { "near-api-js": "^1.0.0 || ^2.0.0" } }, "node_modules/@near-wallet-selector/my-near-wallet/node_modules/@near-wallet-selector/core": { - "version": "8.9.5", - "resolved": "https://registry.npmjs.org/@near-wallet-selector/core/-/core-8.9.5.tgz", - "integrity": "sha512-wJiCL8M7z6tkNMY5H4n63/SZCmlW0Z15H6R1biWgpRuMDlVjhQOzxrmQggb1jbK4nYkzXyARNKyPh2gcRUuS+w==", + "version": "8.9.6", + "resolved": "https://registry.npmjs.org/@near-wallet-selector/core/-/core-8.9.6.tgz", + "integrity": "sha512-pVlv30dpJQbfiT4A2pbQqa5NE8o5oG3qkz6Jo3pBFnvlh+wiOI8a+0dU0cpRLXfYb70N8vMCJfR7OTYCwXjJew==", "dependencies": { "borsh": "0.7.0", "events": "3.3.0", @@ -2144,6 +2146,18 @@ "near-api-js": "^1.0.0 || ^2.0.0" } }, + "node_modules/@near-wallet-selector/my-near-wallet/node_modules/@near-wallet-selector/wallet-utils": { + "version": "8.9.6", + "resolved": "https://registry.npmjs.org/@near-wallet-selector/wallet-utils/-/wallet-utils-8.9.6.tgz", + "integrity": "sha512-OOR0fxuav+HkIVHtyvjaI16JDr9ewYFbBXMhmsYIWctmrUmngtEcnRC61FUYg2syfVVZWPgVQQknoa3SGptVbw==", + "dependencies": { + "@near-wallet-selector/core": "8.9.6", + "bn.js": "5.2.1" + }, + "peerDependencies": { + "near-api-js": "^1.0.0 || ^2.0.0" + } + }, "node_modules/@near-wallet-selector/near-mobile-wallet": { "version": "8.9.5", "resolved": "https://registry.npmjs.org/@near-wallet-selector/near-mobile-wallet/-/near-mobile-wallet-8.9.5.tgz", @@ -2226,6 +2240,45 @@ "near-api-js": "^1.0.0 || ^2.0.0" } }, + "node_modules/@near-wallet-selector/nightly": { + "version": "8.9.6", + "resolved": "https://registry.npmjs.org/@near-wallet-selector/nightly/-/nightly-8.9.6.tgz", + "integrity": "sha512-FDgfZ7QtOCVBRKA25Ef5cZ43e9xgTwPnfa4Lmn1R10gNZM1NTHf4EDINTu0BYhUhnZr34gsNaHDQB+Rg8Fuqng==", + "dependencies": { + "@near-wallet-selector/core": "8.9.6", + "@near-wallet-selector/wallet-utils": "8.9.6", + "is-mobile": "4.0.0" + }, + "peerDependencies": { + "near-api-js": "^1.0.0 || ^2.0.0" + } + }, + "node_modules/@near-wallet-selector/nightly/node_modules/@near-wallet-selector/core": { + "version": "8.9.6", + "resolved": "https://registry.npmjs.org/@near-wallet-selector/core/-/core-8.9.6.tgz", + "integrity": "sha512-pVlv30dpJQbfiT4A2pbQqa5NE8o5oG3qkz6Jo3pBFnvlh+wiOI8a+0dU0cpRLXfYb70N8vMCJfR7OTYCwXjJew==", + "dependencies": { + "borsh": "0.7.0", + "events": "3.3.0", + "js-sha256": "0.9.0", + "rxjs": "7.8.1" + }, + "peerDependencies": { + "near-api-js": "^1.0.0 || ^2.0.0" + } + }, + "node_modules/@near-wallet-selector/nightly/node_modules/@near-wallet-selector/wallet-utils": { + "version": "8.9.6", + "resolved": "https://registry.npmjs.org/@near-wallet-selector/wallet-utils/-/wallet-utils-8.9.6.tgz", + "integrity": "sha512-OOR0fxuav+HkIVHtyvjaI16JDr9ewYFbBXMhmsYIWctmrUmngtEcnRC61FUYg2syfVVZWPgVQQknoa3SGptVbw==", + "dependencies": { + "@near-wallet-selector/core": "8.9.6", + "bn.js": "5.2.1" + }, + "peerDependencies": { + "near-api-js": "^1.0.0 || ^2.0.0" + } + }, "node_modules/@near-wallet-selector/sender": { "version": "8.9.5", "resolved": "https://registry.npmjs.org/@near-wallet-selector/sender/-/sender-8.9.5.tgz", @@ -4548,9 +4601,9 @@ "dev": true }, "node_modules/@wpdas/naxios": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@wpdas/naxios/-/naxios-2.0.1.tgz", - "integrity": "sha512-zxEx4oWxLbcblHjQOjA4V8Gcir59JWC3CtfmxaOtMbHDcAB8USi4eslUyfMBScm6nwApwEj9X/BmQpRoE2NTew==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@wpdas/naxios/-/naxios-2.1.0.tgz", + "integrity": "sha512-9nYUiU7km81KHZhCc4pRI3apcy7teLfxBvjigHvDDMGHMqz9/8kOq2ATi7uFJHrInNEWCXn/k3i8qjM7wortsw==", "dependencies": { "@near-wallet-selector/core": "^8.9.1", "@near-wallet-selector/modal-ui": "^8.9.1", diff --git a/package.json b/package.json index c4e6852..8aa4409 100644 --- a/package.json +++ b/package.json @@ -24,14 +24,16 @@ "@near-wallet-selector/meteor-wallet": "^8.9.5", "@near-wallet-selector/mintbase-wallet": "^8.9.5", "@near-wallet-selector/modal-ui": "^8.9.2", + "@near-wallet-selector/my-near-wallet": "^8.9.6", "@near-wallet-selector/near-mobile-wallet": "^8.9.5", "@near-wallet-selector/nearfi": "^8.9.5", "@near-wallet-selector/neth": "^8.9.5", + "@near-wallet-selector/nightly": "^8.9.6", "@near-wallet-selector/sender": "^8.5.0", "@near-wallet-selector/welldone-wallet": "^8.9.5", "@near-wallet-selector/xdefi": "^8.9.5", "@uidotdev/usehooks": "^2.4.1", - "@wpdas/naxios": "^2.0.1", + "@wpdas/naxios": "^2.1.0", "copy-to-clipboard": "^3.3.3", "formik": "^2.4.5", "fuse.js": "^7.0.0", @@ -58,4 +60,4 @@ "prettier": "^3.2.5", "typescript": "^5" } -} +} \ No newline at end of file diff --git a/pages/index.tsx b/pages/index.tsx index 486c140..b6a634d 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -3,7 +3,7 @@ import { Container } from "@mui/material"; import ChecksSection from "@nadabot/components/pages/home/ChecksSection"; import CompletedSection from "@nadabot/components/pages/home/CompletedSection"; import ExploreSection from "@nadabot/components/pages/home/ExploreSection"; -import InvitationHeroSection from "@nadabot/components/pages/home/InvitationHeroSection"; +// import InvitationHeroSection from "@nadabot/components/pages/home/InvitationHeroSection"; import PendingVerificationSection from "@nadabot/components/pages/home/PendingVerificationSection"; import { useUser } from "@nadabot/hooks/store/useUser"; import useCheckPendingVerification from "@nadabot/hooks/useCheckPendingVerification"; @@ -22,13 +22,17 @@ export default function Home() { return ( <> - + {walletConnected && } - + {/* */} ); } diff --git a/services/contracts/index.ts b/services/contracts/index.ts index caa0473..96eb4ae 100644 --- a/services/contracts/index.ts +++ b/services/contracts/index.ts @@ -5,9 +5,11 @@ import { setupLedger } from "@near-wallet-selector/ledger"; import { setupMathWallet } from "@near-wallet-selector/math-wallet"; import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet"; import { setupMintbaseWallet } from "@near-wallet-selector/mintbase-wallet"; +import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet"; import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet"; import { setupNearFi } from "@near-wallet-selector/nearfi"; import { setupNeth } from "@near-wallet-selector/neth"; +import { setupNightly } from "@near-wallet-selector/nightly"; import { setupSender } from "@near-wallet-selector/sender"; import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet"; import { setupXDEFI } from "@near-wallet-selector/xdefi"; @@ -17,26 +19,25 @@ import { CONTRACT_ID, NETWORK } from "@nadabot/constants"; // Naxios (Contract/Wallet) Instance export const naxiosInstance = new naxios({ + rpcNodeUrl: `https://${NETWORK.toLowerCase() === "mainnet" ? "near" : "near-testnet"}.lava.build`, contractId: CONTRACT_ID, network: NETWORK, walletSelectorModules: [ setupBitgetWallet(), setupSender(), + setupMyNearWallet(), setupHereWallet(), setupMathWallet(), setupMeteorWallet(), setupWelldoneWallet(), + setupNightly(), setupLedger(), setupNearFi(), setupCoin98Wallet(), setupNeth(), setupXDEFI(), setupNearMobileWallet(), - setupMintbaseWallet({ - walletUrl: "https://wallet.mintbase.xyz", - callbackUrl: "https://www.mywebsite.com", - deprecated: false, - }), + setupMintbaseWallet(), ], });