+
+
+
+
+ - {["ledger", "walletconnectv2", "extra"].includes(loginMethod) ? "Please sign the message using xPortal or Ledger" : "Loading..."} -
+{"Loading..."}
-
-
-
-
- {!owned ? (
-
-
-
- );
-};
diff --git a/src/pages/Dashboard.tsx b/src/pages/Dashboard.tsx
index 6e0323c..d0c705e 100644
--- a/src/pages/Dashboard.tsx
+++ b/src/pages/Dashboard.tsx
@@ -1,10 +1,10 @@
import React, { useEffect, useState } from "react";
import { faLink } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { MarketplaceRequirements } from "@itheum/sdk-mx-data-nft";
+import { useGetNetworkConfig, useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks";
import { Loader } from "components";
import { dataNftMarket } from "libs/mvx";
-import { useGetNetworkConfig, useGetPendingTransactions } from "hooks";
-import { MarketplaceRequirements } from "@itheum/sdk-mx-data-nft";
import { convertWeiToEsdt } from "libs/utils";
export const Dashboard = () => {
diff --git a/src/pages/EsdtBubble.tsx b/src/pages/EsdtBubble.tsx
index bbd3569..e462ca5 100644
--- a/src/pages/EsdtBubble.tsx
+++ b/src/pages/EsdtBubble.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useRef, useState } from "react";
import { DataNft } from "@itheum/sdk-mx-data-nft";
-import { Address, SignableMessage } from "@multiversx/sdk-core/out";
-import { useSignMessage } from "@multiversx/sdk-dapp/hooks/signMessage/useSignMessage";
+import { Address } from "@multiversx/sdk-core/out";
+import { useGetAccount, useGetLoginInfo, useGetPendingTransactions } from "@multiversx/sdk-dapp/hooks";
import BigNumber from "bignumber.js";
import { Chart as ChartJS, LinearScale, PointElement, Tooltip, Legend } from "chart.js";
import zoomPlugin from "chartjs-plugin-zoom";
@@ -14,10 +14,8 @@ import { IoClose } from "react-icons/io5";
import Modal from "react-modal";
import { CustomPagination, DataNftCard, ElrondAddressLink, Loader } from "components";
import { ESDT_BUBBLE_NONCES, MAINNET_EXPLORER_ADDRESS } from "config";
-import { useGetAccount, useGetNetworkConfig, useGetPendingTransactions } from "hooks";
import { modalStyles } from "libs/ui";
import { convertWeiToEsdt, shortenAddress, toastError } from "libs/utils";
-import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks";
import { HeaderComponent } from "../components/Layout/HeaderComponent";
ChartJS.register(LinearScale, PointElement, Tooltip, Legend, zoomPlugin);
@@ -151,21 +149,15 @@ export const ChartDescription = () => (
);
export const EsdtBubble = () => {
- const {
- network: { explorerAddress },
- } = useGetNetworkConfig();
const { address } = useGetAccount();
- const { loginMethod } = useGetLoginInfo();
+ const { tokenLogin } = useGetLoginInfo();
const { hasPendingTransactions } = useGetPendingTransactions();
- const { signMessage } = useSignMessage();
const [dataNfts, setDataNfts] = useState
-
-
-
-
- Cantina Corner NFTs: {ccDataNfts.length}
- -
- {ccDataNfts.length > 0 ? (
- ccDataNfts.map((dataNft, index) => (
-
- No DataNFT
- )} -
-
-
-
- View Data
-
-
- ) : isFetchingDataMarshal || !data ? (
- You do not own this Data NFT
-(Buy the Data NFT from the marketplace to unlock the data)
-
-
- ) : (
-
-
- - {["ledger", "walletconnectv2", "extra"].includes(loginMethod) ? "Please sign the message using xPortal or Ledger" : "Loading..."} -
-
-
-
-
-
- )}
- TOP {CC_SHOW_SIZE} Players
-{dataMarshalRes}
*/} -| # | -Nickname | -Rank | -Kills | -Deaths | -Wins | -Losses | -
|---|---|---|---|---|---|---|
| {index + 1} | -{player.nickname} | -{player.rank} | -{player.kills} | -{player.deaths} | -{player.wins} | -{player.losses} | -
You do not own this Data NFT
(Buy the Data NFT from the marketplace to unlock the data)
- ) : isFetchingDataMarshal || !data ? ( + ) : !data ? ( {
}}>
) : (
diff --git a/src/pages/GamerInsights.js b/src/pages/GamerInsights.js
index cb499ad..42fab2f 100644
--- a/src/pages/GamerInsights.js
+++ b/src/pages/GamerInsights.js
@@ -17,17 +17,10 @@ function GamerInsights({ gamerId, gamerData }) {
const [userId, setUserId] = useState(null);
// const { colorMode, toggleColorMode } = useColorMode();
- const [
- readingsDiscordBotUserOnGuildActivity,
- setReadingsDiscordBotUserOnGuildActivity,
- ] = useState([]);
- const [readingsTrdPtyWonderHeroGameApi, setReadingsTrdPtyWonderHeroGameApi] =
- useState([]);
- const [readingsOnChainAddrTxOnCon, setReadingsOnChainAddrTxOnCon] = useState(
- []
- );
- const [readingsOnChainAddrTxOnConErd, setReadingsOnChainAddrTxOnConErd] =
- useState([]);
+ const [readingsDiscordBotUserOnGuildActivity, setReadingsDiscordBotUserOnGuildActivity] = useState([]);
+ const [readingsTrdPtyWonderHeroGameApi, setReadingsTrdPtyWonderHeroGameApi] = useState([]);
+ const [readingsOnChainAddrTxOnCon, setReadingsOnChainAddrTxOnCon] = useState([]);
+ const [readingsOnChainAddrTxOnConErd, setReadingsOnChainAddrTxOnConErd] = useState([]);
const [gamingActivityAllData, setGamingActivityAllData] = useState([]);
const [socialActivityAllData, setSocialActivityAllData] = useState([]);
@@ -36,29 +29,16 @@ function GamerInsights({ gamerId, gamerData }) {
setUserId(gamerId);
setReadingsOnChainAddrTxOnCon(gamerData.readingsOnChainAddrTxOnCon);
setReadingsOnChainAddrTxOnConErd(gamerData.readingsOnChainAddrTxOnConErd);
- setReadingsDiscordBotUserOnGuildActivity(
- gamerData.readingsDiscordBotUserOnGuildActivity
- );
- setReadingsTrdPtyWonderHeroGameApi(
- gamerData.readingsTrdPtyWonderHeroGameApi
- );
+ setReadingsDiscordBotUserOnGuildActivity(gamerData.readingsDiscordBotUserOnGuildActivity);
+ setReadingsTrdPtyWonderHeroGameApi(gamerData.readingsTrdPtyWonderHeroGameApi);
setSocialActivityAllData(gamerData.socialActivityAllData);
setGamingActivityAllData(gamerData.gamingActivityAllData);
}
}, [gamerData]);
- // useEffect(() => {
- // console.log('colorMode', colorMode);
- // }, [colorMode]);
-
return (
<>
- - {["ledger", "walletconnectv2", "extra"].includes(loginMethod) ? "Please sign the message using xPortal or Ledger" : "Loading..."} -
+{"Loading..."}
-
-
-
-
- {!owned ? (
-
-
-
- );
-};
diff --git a/src/pages/ItheumTrailblazer.tsx b/src/pages/ItheumTrailblazer.tsx
index 72ad967..e87c716 100644
--- a/src/pages/ItheumTrailblazer.tsx
+++ b/src/pages/ItheumTrailblazer.tsx
@@ -1,33 +1,18 @@
import React, { useEffect, useState } from "react";
import { DataNft } from "@itheum/sdk-mx-data-nft";
-import { Address, SignableMessage } from "@multiversx/sdk-core/out";
import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks";
-import { useGetLastSignedMessageSession } from "@multiversx/sdk-dapp/hooks/signMessage/useGetLastSignedMessageSession";
-import { useGetSignMessageInfoStatus } from "@multiversx/sdk-dapp/hooks/signMessage/useGetSignedMessageStatus";
-import { useSignMessage } from "@multiversx/sdk-dapp/hooks/signMessage/useSignMessage";
-import { useNavigate, useParams } from "react-router-dom";
import headerHero from "assets/img/custom-app-header-trailblazer.png";
import { DataNftCard, Loader, TrailBlazerModal } from "components";
import { TRAILBLAZER_NONCES } from "config";
import { useGetAccount, useGetPendingTransactions } from "hooks";
import { toastError } from "libs/utils";
import "react-vertical-timeline-component/style.min.css";
-import { sleep } from "libs/utils/legacyUtil";
-import { routeNames } from "routes";
import { HeaderComponent } from "../components/Layout/HeaderComponent";
export const ItheumTrailblazer = () => {
const { address } = useGetAccount();
const { hasPendingTransactions } = useGetPendingTransactions();
- const { signMessage } = useSignMessage();
- const { loginMethod } = useGetLoginInfo();
- const navigate = useNavigate();
- const isWebWallet = loginMethod == "wallet";
- const { targetNonce, targetMessageToBeSigned } = useParams();
- const { isPending: isSignMessagePending } = useGetSignMessageInfoStatus();
- const lastSignedMessageSession = useGetLastSignedMessageSession();
- console.log("isSignMessagePending", isSignMessagePending);
- console.log("lastSignedMessageSession", lastSignedMessageSession);
+ const { tokenLogin } = useGetLoginInfo();
const [itDataNfts, setItDataNfts] = useState
-
-
-
-
- Web3 Gamer Passport
-Data NFTs that Unlock this App: {ccDataNfts.length}
- -
- {ccDataNfts.length > 0 ? (
- ccDataNfts.map((dataNft, index) => (
-
- No Data NFTs
- )} -
-
-
-
- Web3 Gamer Passport
-
-
- ) : isFetchingDataMarshal || !data ? (
- You do not own this Data NFT
-(Buy the Data NFT from the marketplace to unlock the data)
-
-
- ) : (
-
-
- - {["ledger", "walletconnectv2", "extra"].includes(loginMethod) ? "Please sign the message using xPortal or Ledger" : "Loading..."} -
-
-
- )}
- MultiversX Bubbles
+
- {
) : viewDataRes.blobDataType === BlobDataType.SVG ? (
-
) : (
diff --git a/src/pages/MyListed.tsx b/src/pages/MyListed.tsx
index 488a487..9f97839 100644
--- a/src/pages/MyListed.tsx
+++ b/src/pages/MyListed.tsx
@@ -8,8 +8,8 @@ import { useGetAccount, useGetNetworkConfig, useGetPendingTransactions } from "h
import { dataNftMarket } from "libs/mvx";
import { convertToLocalString } from "libs/utils";
import { createNftId } from "libs/utils/token";
-import { Card, CardContent } from "../libComponents/Card";
import { HeaderComponent } from "../components/Layout/HeaderComponent";
+import { Card, CardContent } from "../libComponents/Card";
export const MyListed = () => {
const {
@@ -39,7 +39,7 @@ export const MyListed = () => {
async function fetchDataNfts() {
setIsNftLoading(true);
const nonces: number[] = offers.map((offer) => offer.offeredTokenNonce);
- const _dataNfts: DataNft[] = await DataNft.createManyFromApi(nonces);
+ const _dataNfts: DataNft[] = await DataNft.createManyFromApi(nonces.map(v => ({ nonce: v })));
setDataNfts(_dataNfts);
setIsNftLoading(false);
diff --git a/src/pages/MyWallet.tsx b/src/pages/MyWallet.tsx
index 859681a..eefb833 100644
--- a/src/pages/MyWallet.tsx
+++ b/src/pages/MyWallet.tsx
@@ -1,25 +1,19 @@
import React, { useEffect, useState } from "react";
import { DataNft, ViewDataReturnType } from "@itheum/sdk-mx-data-nft";
-import { Address, SignableMessage } from "@multiversx/sdk-core/out";
import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks";
-import { useGetLastSignedMessageSession } from "@multiversx/sdk-dapp/hooks/signMessage/useGetLastSignedMessageSession";
-import { useGetSignMessageInfoStatus } from "@multiversx/sdk-dapp/hooks/signMessage/useGetSignedMessageStatus";
import * as DOMPurify from "dompurify";
import { ModalBody } from "react-bootstrap";
import ModalHeader from "react-bootstrap/esm/ModalHeader";
import { IoClose } from "react-icons/io5";
import SVG from "react-inlinesvg";
import Modal from "react-modal";
-import { useNavigate, useParams } from "react-router-dom";
+import imgGuidePopup from "assets/img/guide-unblock-popups.png";
import { DataNftCard, Loader } from "components";
import { MARKETPLACE_DETAILS_PAGE } from "config";
-import { useGetAccount, useGetPendingTransactions, useSignMessage } from "hooks";
+import { useGetAccount, useGetPendingTransactions } from "hooks";
import { BlobDataType } from "libs/types";
import { modalStyles } from "libs/ui";
import { toastError } from "libs/utils";
-import { sleep } from "libs/utils/legacyUtil";
-import { routeNames } from "routes";
-import imgGuidePopup from "assets/img/guide-unblock-popups.png";
import { HeaderComponent } from "../components/Layout/HeaderComponent";
interface ExtendedViewDataReturnType extends ViewDataReturnType {
@@ -29,13 +23,7 @@ interface ExtendedViewDataReturnType extends ViewDataReturnType {
export const MyWallet = () => {
const { address } = useGetAccount();
const { hasPendingTransactions } = useGetPendingTransactions();
- const { signMessage } = useSignMessage();
- const { loginMethod } = useGetLoginInfo();
- const navigate = useNavigate();
- const isWebWallet = loginMethod == "wallet";
- const { targetNonce, targetMessageToBeSigned } = useParams();
- const { isPending: isSignMessagePending } = useGetSignMessageInfoStatus();
- const lastSignedMessageSession = useGetLastSignedMessageSession();
+ const { tokenLogin } = useGetLoginInfo();
const [dataNftCount, setDataNftCount] = useState- {["ledger", "walletconnectv2", "extra"].includes(loginMethod) ? "Please sign the message using xPortal or Ledger" : "Loading..."} -
+{"Loading..."}
- {["ledger", "walletconnectv2", "extra"].includes(loginMethod) ? "Please sign the message using xPortal or Ledger" : "Loading..."} -
+{"Loading..."}
- {["ledger", "walletconnectv2", "extra"].includes(loginMethod) ? "Please sign the message using xPortal or Ledger" : "Loading..."} + {"Loading..."}