fix: bugs

lfglabs-dev · Aug 13, 2024 · f5097de · f5097de
1 parent c320234
commit f5097de
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 37 deletions.
diff --git a/app/components/claimXTicket.tsx b/app/components/claimXTicket.tsx
@@ -58,19 +58,20 @@ const ClaimXTicket: FunctionComponent<ClaimXTicketProps> = ({
   return (
     <>
       {isConnected && !isFinished && hasClaimedX !== undefined && address ? (
-        <div className={styles.statsSection}>
-          <p>Retweet to get an extra ticket</p>
+        <div className={styles.statsSection} style={{ marginTop: "10px" }}>
+          <p>Claim your extra ticket</p>
           {!hasClaimedX ? (
             <Button
               onClick={() => getExtraTicket(address)}
-              icon={
-                <img
-                  src="/visuals/twitterIcon.svg"
-                  alt="Twitter Icon"
-                  width={20}
-                />
-              }
+              // icon={
+              //   <img
+              //     src="/visuals/twitterIcon.svg"
+              //     alt="Twitter Icon"
+              //     width={20}
+              //   />
+              // }
               width={width}
+              variation="white"
             >
               Claim
             </Button>

diff --git a/app/components/extraClickModal.tsx b/app/components/extraClickModal.tsx
@@ -12,7 +12,6 @@ type ExtraClickModalProps = {
   closeModal: () => void;
   open: boolean;
   network?: NetworkType;
-  addrOrName?: string;
   address?: string;
   hasClaimed2FA?: boolean;
   claim2FATicket: () => void;
@@ -25,7 +24,6 @@ const ExtraClickModal: FunctionComponent<ExtraClickModalProps> = ({
   closeModal,
   open,
   network,
-  addrOrName,
   address,
   hasClaimed2FA,
   claim2FATicket,
@@ -34,7 +32,6 @@ const ExtraClickModal: FunctionComponent<ExtraClickModalProps> = ({
   setHasClaimedX,
 }) => {
   const [hasClicked, setHasClicked] = useState(false);
-  const btnIcon = <img src="/visuals/starknetIcon.svg" />;
 
   const modalTitle =
     hasClaimed2FA && hasClaimedX ? (
@@ -77,12 +74,6 @@ const ExtraClickModal: FunctionComponent<ExtraClickModalProps> = ({
               {modalTitle}
             </div>
 
-            {addrOrName ? (
-              <Button icon={btnIcon} width={260} variation="white">
-                {addrOrName}
-              </Button>
-            ) : null}
-
             {!hasClaimed2FA ? (
               <>
                 <div className={styles.description}>

diff --git a/app/page.tsx b/app/page.tsx
@@ -6,7 +6,7 @@ import Button from "./components/button";
 import EthButton from "./components/ethButton";
 import Stats from "./components/stats";
 import Countdown from "./components/countdown";
-import { Suspense, useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useAccount, useConnect, useDisconnect } from "@starknet-react/core";
 import { NetworkType, RemainingClicks } from "@/constants/types";
 import ConnectModal from "./components/connection/connectModal";
@@ -68,7 +68,6 @@ import LeaderboardWrapper from "./components/leaderboard/leaderboardWrapper";
 import VideoBackground from "./components/videoBackground";
 import getWalletType from "@/hooks/getWalletType";
 import CountdownWithDays from "./components/countdownWithDays";
-import ClaimXTicket from "./components/claimXTicket";
 import ExtraClickModal from "./components/extraClickModal";
 
 export default function Home() {
@@ -464,7 +463,6 @@ export default function Home() {
           txVersion as number,
           deploymentData
         );
-        console.log("virtualTxId", virtualTxId);
         if (!virtualTxId && !virtualTxId.virtual_tx_id) {
           setErrorMsg("Error while resetting eth button");
           setShowErrorMsg(true);
@@ -510,7 +508,6 @@ export default function Home() {
             txVersion as number,
             deploymentData
           );
-          console.log("virtualTxId", virtualTxId);
           if (!virtualTxId && !virtualTxId.virtual_tx_id) {
             setErrorMsg("Error while resetting eth button");
             setShowErrorMsg(true);
@@ -625,6 +622,7 @@ export default function Home() {
 
   const claim2FATicket = () => {
     if (!walletType || network === NetworkType.EVM || !address) return;
+    console.log("walletType", walletType);
     claim2FATicketQuery(address, walletType)
       .then((res) => {
         if (res.error) {
@@ -677,19 +675,6 @@ export default function Home() {
                 </>
               ) : (
                 <>
-                  <Suspense>
-                    <div className={styles.remainingClicksMobile}>
-                      <ClaimXTicket
-                        isConnected={isConnected}
-                        isFinished={isFinished}
-                        hasClaimedX={hasClaimedX}
-                        address={address}
-                        showClaimed={false}
-                        width={230}
-                        setHasClaimedX={setHasClaimedX}
-                      />
-                    </div>
-                  </Suspense>
                   <Button
                     onClick={connectBtnAction}
                     icon={
@@ -807,7 +792,6 @@ export default function Home() {
             closeModal={() => setExtraClickModal(false)}
             open={extraClickModal}
             network={network}
-            addrOrName={getConnectionBtnText()}
             address={address}
             hasClaimed2FA={hasClaimed2FA}
             claim2FATicket={claim2FATicket}

diff --git a/services/apiService.ts b/services/apiService.ts
@@ -3,7 +3,6 @@ import {
   GetDeploymentDataResult,
   WalletType,
 } from "@/constants/types";
-import { getError } from "@/utils/stringService";
 import { Signature, stark } from "starknet";
 
 const baseurl = process.env.NEXT_PUBLIC_ETH_BUTTON_API;