diff --git a/apps/web/src/app/(routes)/bridge/_components/NftTransferSummary.tsx b/apps/web/src/app/(routes)/bridge/_components/NftTransferSummary.tsx index 62446531..8750c03d 100644 --- a/apps/web/src/app/(routes)/bridge/_components/NftTransferSummary.tsx +++ b/apps/web/src/app/(routes)/bridge/_components/NftTransferSummary.tsx @@ -47,18 +47,18 @@ function TransferAction() { width="32" xmlns="http://www.w3.org/2000/svg" > - + ; } return bridgeRequestData.length === 0 ? ( diff --git a/apps/web/src/app/_components/Footer.tsx b/apps/web/src/app/_components/Footer.tsx index 4f6976c2..9a5b4eb3 100644 --- a/apps/web/src/app/_components/Footer.tsx +++ b/apps/web/src/app/_components/Footer.tsx @@ -3,20 +3,21 @@ import Image from "next/image"; export default function Footer() { return ( -
- TheArkProject logo -
- {/* Terms of use - FAQ - Documentation */} - © 2023 Screenshot Labs -
-
+ // + <> ); } diff --git a/apps/web/src/app/_components/Header.tsx b/apps/web/src/app/_components/Header.tsx index e62de136..10a5e7d5 100644 --- a/apps/web/src/app/_components/Header.tsx +++ b/apps/web/src/app/_components/Header.tsx @@ -1,6 +1,9 @@ "use client"; -import { useAccount as useStarknetAccount } from "@starknet-react/core"; +import { + useConnectors, + useAccount as useStarknetAccount, +} from "@starknet-react/core"; import { Typography } from "design-system"; import Link from "next/link"; import { usePathname, useRouter } from "next/navigation"; @@ -26,21 +29,15 @@ export default function Header() { isConnected: isEthereumConnected, isConnecting: isEthereumConnecting, } = useEthereumAccount(); - const { - // isConnected: isStarknetConnected, - // isConnecting: isStarknetConnecting, - } = useStarknetAccount(); + const { isConnected: isStarknetConnected } = useStarknetAccount(); + const { isLoading: isStarknetLoading } = useConnectors(); const router = useRouter(); const pathname = usePathname(); const isFullyConnected = isEthereumConnected; - // && isStarknetConnected; // TODO @YohanTz: fix isConnecting in starknet-react - const isConnecting = isEthereumConnecting; - // || - // isStarknetConnecting || - // isStarknetConnecting === undefined; + const isConnecting = isEthereumConnecting || isStarknetLoading; useEffect(() => { if (pathname === "/" && isFullyConnected) { diff --git a/apps/web/src/server/api/routers/bridgeRequest.ts b/apps/web/src/server/api/routers/bridgeRequest.ts index 6c513adb..d0743929 100644 --- a/apps/web/src/server/api/routers/bridgeRequest.ts +++ b/apps/web/src/server/api/routers/bridgeRequest.ts @@ -41,7 +41,9 @@ export const bridgeRequestRouter = createTRPCRouter({ const { address } = input; const bridgeRequestsResponse = await fetch( - `https://idx-testnet.starklane.io/requests/${address}`, + `${ + process.env.NEXT_PUBLIC_STARKLANE_API_DOMAIN ?? "" + }/requests/${address}`, { headers: { "Content-Type": "application/json", diff --git a/apps/web/src/server/api/routers/nfts.ts b/apps/web/src/server/api/routers/nfts.ts index 006bb7d4..350a323e 100644 --- a/apps/web/src/server/api/routers/nfts.ts +++ b/apps/web/src/server/api/routers/nfts.ts @@ -77,7 +77,7 @@ export const nftsRouter = createTRPCRouter({ const ownedNftsResponse = await fetch( `${ process.env.NEXT_PUBLIC_ARK_API_DOMAIN ?? "" - }/v1/owners/${validateAndParseAddress(address)}/nfts`, + }/v1/owners/${validateAndParseAddress(address)}/tokens`, { headers: { "Content-Type": "application/json", @@ -87,6 +87,7 @@ export const nftsRouter = createTRPCRouter({ ); if (ownedNftsResponse.status !== 200) { + console.log(ownedNftsResponse.status); return { byCollection: {}, raw: [] }; } diff --git a/turbo.json b/turbo.json index af85d618..d843153f 100644 --- a/turbo.json +++ b/turbo.json @@ -17,6 +17,7 @@ "HOSTNAME_L2", "L2_DEPLOYER_PRIVATE_KEY", "L2_DEPLOYER_ADDRESS", + "NEXT_PUBLIC_STARKLANE_API_DOMAIN", "GOERLI_ALCHEMY_KEY", "MAINNET_ALCHEMY_KEY", "L2_DEPLOYER_SALT",