+ onClick={closeModal}>
- Itheum Trailblazer -
+Itheum Trailblazer
+
) : (
+ {["ledger", "walletconnectv2", "extra"].includes(loginMethod) ? "Please sign the message using xPortal or Ledger" : "Loading..."} +
+
+
+ Testing
+
+
+ );
+};
\ No newline at end of file
diff --git a/src/config.tsx b/src/config.tsx
index f79d0ca..68d6c3a 100644
--- a/src/config.tsx
+++ b/src/config.tsx
@@ -21,7 +21,7 @@ export const CANTINA_CORNER_NONCES = [50, 51, 52];
export const TRAILBLAZER_NONCES =
process.env.REACT_APP_ENV_NETWORK &&
process.env.REACT_APP_ENV_NETWORK === EnvironmentsEnum.devnet
- ? [407, 423]
+ ? [407, 423, 453]
: [1];
export const CC_SHOW_SIZE = 10;
diff --git a/src/index.css b/src/index.css
new file mode 100644
index 0000000..bd6213e
--- /dev/null
+++ b/src/index.css
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
\ No newline at end of file
diff --git a/src/index.tsx b/src/index.tsx
index 4c37236..4ac6385 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,6 +1,7 @@
import './assets/sass/theme.scss';
import React from 'react';
import { createRoot } from 'react-dom/client';
+import "./index.css";
import { App } from './App';
const container = document.getElementById('root');
diff --git a/src/pages/CantinaCorner.tsx b/src/pages/CantinaCorner.tsx
index 37ce4e0..62cdbcf 100644
--- a/src/pages/CantinaCorner.tsx
+++ b/src/pages/CantinaCorner.tsx
@@ -26,6 +26,7 @@ import {
import { DataNft } from "@itheum/sdk-mx-data-nft";
import { toastError } from "libs/utils";
import { modalStyles } from "libs/ui";
+import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks";
ChartJS.register(
RadialLinearScale,
@@ -107,6 +108,7 @@ export const CantinaCorner = () => {
} = useGetNetworkConfig();
const { address } = useGetAccount();
const { hasPendingTransactions } = useGetPendingTransactions();
+ const { loginMethod } = useGetLoginInfo();
const [ccDataNfts, setCcDataNfts] = useState
+
+ {["ledger", "walletconnectv2", "extra"].includes(loginMethod) + ? "Please sign the message using xPortal or Ledger" + : "Loading..."} +
+ {
network: { explorerAddress },
} = useGetNetworkConfig();
const { address } = useGetAccount();
+ const { loginMethod } = useGetLoginInfo();
const { hasPendingTransactions } = useGetPendingTransactions();
const [dataNfts, setDataNfts] = useState([]);
const [selectedDataNft, setSelectedDataNft] = useState();
const [flags, setFlags] = useState([]);
const [isLoading, setIsLoading] = useState(true);
+ const [isPendingMessageSigned, setIsPendingMessageSigned] = useState(false);
const [isFetchingDataMarshal, setIsFetchingDataMarshal] =
useState(true);
@@ -265,7 +268,9 @@ export const EsdtBubble = () => {
setSelectedDataNft(dataNft);
const messageToBeSigned = await dataNft.getMessageToSign();
console.log("messageToBeSigned", messageToBeSigned);
+ setIsPendingMessageSigned(true);
const signedMessage = await signMessage({ message: messageToBeSigned });
+ setIsPendingMessageSigned(false);
console.log("signedMessage", signedMessage);
const res = await dataNft.viewData(
messageToBeSigned,
@@ -442,7 +447,14 @@ export const EsdtBubble = () => {
minHeight: "40rem",
}}
>
-
) : (
<>
diff --git a/src/pages/GamerPassportGamer.tsx b/src/pages/GamerPassportGamer.tsx
index 325d206..9fb7d68 100644
--- a/src/pages/GamerPassportGamer.tsx
+++ b/src/pages/GamerPassportGamer.tsx
@@ -21,6 +21,7 @@ import {
} from "libs/utils/core";
import GamerInsights from "./GamerInsights";
import { modalStyles } from "libs/ui";
+import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks";
export const GamerPassportGamer = () => {
const {
@@ -28,6 +29,7 @@ export const GamerPassportGamer = () => {
} = useGetNetworkConfig();
const { address } = useGetAccount();
const { hasPendingTransactions } = useGetPendingTransactions();
+ const { loginMethod } = useGetLoginInfo();
const [ccDataNfts, setCcDataNfts] = useState
+
+ {["ledger", "walletconnectv2", "extra"].includes(loginMethod) + ? "Please sign the message using xPortal or Ledger" + : "Loading..."} +
+
+
) : (
+ {["ledger", "walletconnectv2", "extra"].includes(loginMethod) + ? "Please sign the message using xPortal or Ledger" + : "Loading..."} +
+ {
const { address } = useGetAccount();
@@ -26,8 +28,7 @@ export const ItheumTrailblazer = () => {
const [flags, setFlags] = useState([]);
const [isLoading, setIsLoading] = useState(true);
const [isNftLoading, setIsNftLoading] = useState(false);
- const [isFetchingDataMarshal, setIsFetchingDataMarshal] =
- useState(true);
+ const [isFetchingDataMarshal, setIsFetchingDataMarshal] = useState(true);
const [owned, setOwned] = useState(false);
const [data, setData] = useState();
const [isModalOpened, setIsModalOpened] = useState(false);
@@ -42,9 +43,7 @@ export const ItheumTrailblazer = () => {
async function fetchAppNfts() {
setIsLoading(true);
- const _nfts: DataNft[] = await DataNft.createManyFromApi(
- TRAILBLAZER_NONCES
- );
+ const _nfts: DataNft[] = await DataNft.createManyFromApi(TRAILBLAZER_NONCES);
setItDataNfts(_nfts);
setIsLoading(false);
@@ -106,14 +105,8 @@ export const ItheumTrailblazer = () => {
if (isWebWallet) return;
const sm = new SignableMessage({
address: new Address(address),
- message: Buffer.from(
- signedMessage.payload.signedSession.message,
- "ascii"
- ),
- signature: Buffer.from(
- signedMessage.payload.signedSession.signature,
- "hex"
- ),
+ message: Buffer.from(signedMessage.payload.signedSession.message, "ascii"),
+ signature: Buffer.from(signedMessage.payload.signedSession.signature, "hex"),
});
const res = await dataNft.viewData(messageToBeSigned, sm);
@@ -136,21 +129,14 @@ export const ItheumTrailblazer = () => {
}
}
- async function processSignature(
- nonce: number,
- messageToBeSigned: string,
- signedMessage: SignableMessage
- ) {
+ async function processSignature(nonce: number, messageToBeSigned: string, signedMessage: SignableMessage) {
try {
setIsFetchingDataMarshal(true);
setOwned(true);
openModal();
const dataNft = await DataNft.createFromApi(nonce);
- const res = await dataNft.viewData(
- messageToBeSigned,
- signedMessage as any as SignableMessage
- );
+ const res = await dataNft.viewData(messageToBeSigned, signedMessage as any as SignableMessage);
res.data = await (res.data as Blob).text();
res.data = JSON.parse(res.data);
@@ -183,11 +169,7 @@ export const ItheumTrailblazer = () => {
signature: Buffer.from(signature, "hex"),
signer: loginMethod,
});
- await processSignature(
- Number(targetNonce),
- targetMessageToBeSigned,
- signedMessage
- );
+ await processSignature(Number(targetNonce), targetMessageToBeSigned, signedMessage);
})();
}
}, [isWebWallet, targetNonce]);
@@ -202,28 +184,15 @@ export const ItheumTrailblazer = () => {
) : (
viewDataRes &&
diff --git a/src/pages/PlayStationGamer.tsx b/src/pages/PlayStationGamer.tsx
index b8a1254..7628d2d 100644
--- a/src/pages/PlayStationGamer.tsx
+++ b/src/pages/PlayStationGamer.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useState } from "react";
import { DataNft } from "@itheum/sdk-mx-data-nft";
import { SignableMessage } from "@multiversx/sdk-core/out";
+import { useGetLoginInfo } from "@multiversx/sdk-dapp/hooks";
import { signMessage } from "@multiversx/sdk-dapp/utils/account";
import { ModalBody } from "react-bootstrap";
import ModalHeader from "react-bootstrap/esm/ModalHeader";
@@ -17,6 +18,7 @@ import PlaystationGamerInsights from "./PlaystationGamerInsights";
export const PlayStationGamer = () => {
const { address } = useGetAccount();
const { hasPendingTransactions } = useGetPendingTransactions();
+ const { loginMethod } = useGetLoginInfo();
const [ccDataNfts, setCcDataNfts] = useStateTrailblazer
- 
+
-
- - Data NFTs that Unlock this App: {itDataNfts.length} -
+Data NFTs that Unlock this App: {itDataNfts.length}
{itDataNfts.length > 0 ? (
itDataNfts.map((dataNft, index) => (
-
No Data NFTs
@@ -234,13 +203,7 @@ export const ItheumTrailblazer = () => {
+
+ {["ledger", "walletconnectv2", "extra"].includes( + loginMethod + ) + ? "Please sign the message using xPortal or Ledger" + : "Loading..."} +
+
+
) : (
+ {["ledger", "walletconnectv2", "extra"].includes(loginMethod) + ? "Please sign the message using xPortal or Ledger" + : "Loading..."} +
+