Fix estimating fees nonstop spinning

cartridge-gg · Aug 11, 2024 · 4ab68ca · 4ab68ca
1 parent d298701
commit 4ab68ca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/packages/keychain/src/components/Execute/Fees.tsx b/packages/keychain/src/components/Execute/Fees.tsx
@@ -7,11 +7,9 @@ import { EthereumIcon } from "@cartridge/ui";
 
 export function Fees({
   fees,
-  balance,
   approved,
 }: {
   fees?: { base: bigint; max: bigint };
-  balance: string;
   approved?: string;
 }) {
   const chainId = useChainId();
@@ -21,7 +19,7 @@ export function Fees({
   }>();
 
   useEffect(() => {
-    if (!fees || !balance) {
+    if (!fees) {
       return;
     }
     async function compute() {
@@ -38,7 +36,7 @@ export function Fees({
       );
     }
     compute();
-  }, [chainId, fees, balance, approved]);
+  }, [chainId, fees, approved]);
 
   return (
     <VStack

diff --git a/packages/keychain/src/components/Execute/index.tsx b/packages/keychain/src/components/Execute/index.tsx
@@ -78,7 +78,7 @@ export function Execute() {
       return;
     }
 
-    if (isDeployed && ctx.transactionsDetail?.maxFee) {
+    if (ctx.transactionsDetail?.maxFee) {
       setFees({
         base: BigInt(ctx.transactionsDetail.maxFee),
         max: BigInt(ctx.transactionsDetail.maxFee),
@@ -177,7 +177,7 @@ export function Execute() {
             />
           )
         ) : (
-          <Fees fees={fees} balance={ethBalance && format(ethBalance)} />
+          <Fees fees={fees} />
         )}
         <Button
           colorScheme="colorful"

diff --git a/packages/keychain/src/components/connect/Login.tsx b/packages/keychain/src/components/connect/Login.tsx
@@ -23,7 +23,7 @@ export function Login(props: LoginProps) {
           ? "Play with Cartridge Controller"
           : `Play ${theme.name}`
       }
-      description="Enter your Controller username (yoyo)"
+      description="Enter your Controller username"
     >
       <Form {...props} />
     </Container>