fixing e2e

lfglabs-dev · Oct 14, 2024 · 4c3863f · 4c3863f
1 parent c73abf4
commit 4c3863f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/components/discover/claimModal.tsx b/components/discover/claimModal.tsx
@@ -148,7 +148,7 @@ const ClaimModal: FunctionComponent<ClaimModalProps> = ({
                 />
               </div>
               <div className="flex w-full flex-col py-4 max-h-80 overflow-auto">
-                {rewards && Object.keys(rewards).length > 0 ? (
+                {rewards && calls.length > 0 ? (
                   Object.entries(rewards)
                     .filter(([key, rewardList]) => key && rewardList.length > 0)
                     .map(([key, rewardList]) => (
@@ -178,7 +178,10 @@ const ClaimModal: FunctionComponent<ClaimModalProps> = ({
                 <Typography type={TEXT_TYPE.BODY_MIDDLE}>Cancel</Typography>
               </button>
               <div className="w-fit">
-                <Button disabled={!calls} onClick={doClaimRewards}>
+                <Button
+                  disabled={!calls || calls.length === 0 || loading}
+                  onClick={doClaimRewards}
+                >
                   Claim all
                 </Button>
               </div>

diff --git a/components/discover/defiTable.tsx b/components/discover/defiTable.tsx
@@ -36,6 +36,7 @@ import { getRedirectLink } from "@utils/defi";
 import DefiTableSkeleton from "./defiTableSkeleton";
 import ClaimModal from "./claimModal";
 import SuccessModal from "./successModal";
+import { useAccount } from "@starknet-react/core";
 
 type DataTableProps = {
   data: TableInfo[];
@@ -247,14 +248,16 @@ const DataTable: FunctionComponent<DataTableProps> = ({ data, loading }) => {
     },
   ]);
 
+  const { address } = useAccount();
+
   const [tokenFilter, setTokenFilter] = useState<string>();
   const [liquidityFilter, setLiquidityFilter] = useState<string>();
   const [securityFilter, setSecurityFilter] = useState<string>();
   const [airdropFilter, setAirdropFilter] = useState<string>();
 
   const [showClaimModal, setShowClaimModal] = useState(false);
   const [showSuccessModal, setShowSuccessModal] = useState(false);
-  
+
   const table = useReactTable({
     data,
     columns,
@@ -312,7 +315,9 @@ const DataTable: FunctionComponent<DataTableProps> = ({ data, loading }) => {
   return (
     <div className="w-full overflow-x-auto">
       <div className="">
-        <div className={`flex w-100 lg:flex-row flex-col justify-between items-start`}>
+        <div
+          className={`flex w-100 lg:flex-row flex-col justify-between items-start`}
+        >
           <div className={`flex w-100 flex-col gap-2`}>
             <Typography type={TEXT_TYPE.H4} color="secondary">
               Explore reward opportunities
@@ -322,8 +327,9 @@ const DataTable: FunctionComponent<DataTableProps> = ({ data, loading }) => {
             </Typography>
           </div>
           <div
-            onClick={() => setShowClaimModal(true)}
-            className="flex flex-row items-center justify-evenly gap-4 bg-white rounded-xl modified-cursor-pointer h-min lg:mt-2 mt-8 px-6 py-2.5">
+            onClick={() => address && setShowClaimModal(true)}
+            className="flex flex-row items-center justify-evenly gap-4 bg-white rounded-xl modified-cursor-pointer h-min lg:mt-2 mt-8 px-6 py-2.5"
+          >
             <AppIcon app="starknet" className="w-5 h-5" />
             <Typography type={TEXT_TYPE.BUTTON_LARGE} color="background">
               Claim all
@@ -414,13 +420,14 @@ const DataTable: FunctionComponent<DataTableProps> = ({ data, loading }) => {
                     return (
                       <TableHead
                         key={header.id}
-                        onClick={header.column.getToggleSortingHandler()}>
+                        onClick={header.column.getToggleSortingHandler()}
+                      >
                         {header.isPlaceholder
                           ? null
                           : flexRender(
-                            header.column.columnDef.header,
-                            header.getContext()
-                          )}
+                              header.column.columnDef.header,
+                              header.getContext()
+                            )}
                       </TableHead>
                     );
                   })}
@@ -435,9 +442,12 @@ const DataTable: FunctionComponent<DataTableProps> = ({ data, loading }) => {
                     data-state={row.getIsSelected() && "selected"}
                     onClick={() => {
                       window.open(
-                        getRedirectLink(row.getValue("app"), row.getValue("action")),
+                        getRedirectLink(
+                          row.getValue("app"),
+                          row.getValue("action")
+                        ),
                         "_blank"
-                      )
+                      );
                     }}
                   >
                     {row.getVisibleCells().map((cell) => (
@@ -463,7 +473,9 @@ const DataTable: FunctionComponent<DataTableProps> = ({ data, loading }) => {
               onClick={() =>
                 table.getCanPreviousPage() ? table.previousPage() : null
               }
-              style={table.getCanPreviousPage() ? {} : { cursor: 'not-allowed' }}
+              style={
+                table.getCanPreviousPage() ? {} : { cursor: "not-allowed" }
+              }
             >
               <CDNImage
                 src="/icons/chevronLeft.svg"
@@ -475,7 +487,7 @@ const DataTable: FunctionComponent<DataTableProps> = ({ data, loading }) => {
             <div
               className="flex modified-cursor-pointer"
               onClick={() => (table.getCanNextPage() ? table.nextPage() : null)}
-              style={table.getCanNextPage() ? {} : { cursor: 'not-allowed' }}
+              style={table.getCanNextPage() ? {} : { cursor: "not-allowed" }}
             >
               <CDNImage
                 src="/icons/chevronRight.svg"