mirror of
				https://github.com/i701/sarlink-portal.git
				synced 2025-10-30 21:37:00 +00:00 
			
		
		
		
	fix: pagination in PaymentsTable and TopupsTable components 🐛
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Build and Push Docker Images / Build and Push Docker Images (push) Successful in 7m35s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Build and Push Docker Images / Build and Push Docker Images (push) Successful in 7m35s
				
			This commit is contained in:
		| @@ -25,20 +25,19 @@ export default async function TopupPage({ | ||||
|       <div className="flex justify-between items-center border rounded-md border-dashed font-bold title-bg py-4 px-4 mb-4 mx-2"> | ||||
|         <h3 className="text-sarLinkOrange text-2xl">Topup</h3> | ||||
|         <div className="flex flex-col gap-4 items-end w-full"> | ||||
|           {!topup.is_expired || | ||||
|             (topup.status !== "PENDING" && ( | ||||
|               <Button | ||||
|                 disabled | ||||
|                 className={cn( | ||||
|                   "rounded-md opacity-100! uppercase font-semibold", | ||||
|                   // topup?.paid | ||||
|                   // ? "text-green-900 bg-green-500/20" | ||||
|                   // : "text-inherit bg-yellow-400", | ||||
|                 )} | ||||
|               > | ||||
|                 {topup?.paid ? <span>Paid</span> : ""} | ||||
|               </Button> | ||||
|             ))} | ||||
|           {!topup.is_expired && topup.paid && topup.status !== "PENDING" && ( | ||||
|             <Button | ||||
|               disabled | ||||
|               className={cn( | ||||
|                 "rounded-md opacity-100! uppercase font-semibold", | ||||
|                 topup?.paid | ||||
|                   ? "text-green-900 bg-green-500/20" | ||||
|                   : "text-inherit bg-yellow-400", | ||||
|               )} | ||||
|             > | ||||
|               {topup.status} | ||||
|             </Button> | ||||
|           )} | ||||
|           {topup.status === "PENDING" && !topup.is_expired && ( | ||||
|             <Button> | ||||
|               <TextShimmer>Payment Pending</TextShimmer>{" "} | ||||
| @@ -62,20 +61,20 @@ export default async function TopupPage({ | ||||
|             ))} | ||||
|         </div> | ||||
|       </div> | ||||
|       { | ||||
|         (!topup.paid && topup.status === "PENDING" && !topup.is_expired) && ( | ||||
|           <ExpiryCountDown expiryLabel="Top up" expiresAt={topup.expires_at} /> | ||||
|         ) | ||||
|       } | ||||
|       {!topup.paid && topup.status === "PENDING" && !topup.is_expired && ( | ||||
|         <ExpiryCountDown expiryLabel="Top up" expiresAt={topup.expires_at} /> | ||||
|       )} | ||||
|       <div | ||||
|         id="user-topup-details" | ||||
|         className="pb-4 gap-4 flex sm:flex-row flex-col items-start justify-start" | ||||
|       > | ||||
|         <TopupToPay | ||||
|           disabled={topup.paid || topup.is_expired || topup.status === "CANCELLED"} | ||||
|           disabled={ | ||||
|             topup.paid || topup.is_expired || topup.status === "CANCELLED" | ||||
|           } | ||||
|           topup={topup || undefined} | ||||
|         /> | ||||
|       </div> | ||||
|     </div > | ||||
|     </div> | ||||
|   ); | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user