Merge branch 'master' into hf/fix/ui

Author: LuizAsFight

.changeset/brown-geckos-shout.md

@@ -0,0 +1,5 @@
+---
+"fuels-wallet": patch
+---
+
+chore: remove label in loading state

.changeset/popular-mails-argue.md

@@ -0,0 +1,2 @@
+---
+---

packages/app/playwright/e2e/RecoverWallet.test.ts

@@ -99,7 +99,7 @@ test.describe('RecoverWallet', () => {
           },
           { timeout: 1000 }
         )
-        .toBe(words.length);
+        .toBeGreaterThanOrEqual(words.length);
       const inputs = await page.locator('input').all();
       words.forEach((word, i) => {
         expect(inputs[i]).toHaveValue(word);
@@ -148,7 +148,11 @@ test.describe('RecoverWallet', () => {
       await getButtonByText(page, /Paste/i).click();
 
       /** Confirm the auto-selected mnemonic size */
-      expect(format).toHaveValue('15');
+      await expect
+        .poll(async () =>
+          (await getByAriaLabel(page, 'Select format')).inputValue()
+        )
+        .toBe('15');
 
       /** Confirm Mnemonic */
       const words = WORDS_13.split(' ');

packages/app/src/systems/Account/components/QuickAccountConnect/QuickAccountConnect.tsx

@@ -9,7 +9,7 @@ import {
   VStack,
   toast,
 } from '@fuel-ui/react';
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { useCurrentTab } from '~/systems/CRX/hooks/useCurrentTab';
 import { useConnection } from '~/systems/DApp/hooks/useConnection';
 import { useOrigin } from '~/systems/DApp/hooks/useOrigin';
@@ -22,10 +22,6 @@ enum ConnectionStatus {
   NoAccounts = 'NO_ACCOUNTS',
 }
 
-export const getDismissKey = (account: string, origin: string) => {
-  return `quick-account-connect-${account}-${origin}`;
-};
-
 export const QuickAccountConnect = () => {
   const { account } = useCurrentAccount();
   const { currentTab } = useCurrentTab();
@@ -34,7 +30,7 @@ export const QuickAccountConnect = () => {
     origin: origin?.full,
   });
 
-  const [dismissed, setDismissed] = useState(true);
+  const [dismissedAccount, setDismissedAccount] = useState<string>('');
 
   const status = useMemo<ConnectionStatus>(() => {
     if (!account || !connection) {
@@ -48,6 +44,10 @@ export const QuickAccountConnect = () => {
     return ConnectionStatus.OtherAccount;
   }, [account, connection]);
 
+  const isDismissed = useMemo<boolean>(() => {
+    return account?.address === dismissedAccount;
+  }, [account?.address, dismissedAccount]);
+
   const onConnect = async () => {
     if (!origin || !account) return;
     await ConnectionService.addAccountTo({
@@ -59,25 +59,15 @@ export const QuickAccountConnect = () => {
   };
 
   const onDismiss = () => {
-    if (!origin || !account) return;
-    setDismissed(true);
-    if (typeof localStorage !== 'undefined') {
-      localStorage.setItem(getDismissKey(account.address, origin.full), 'true');
+    if (account?.address) {
+      setDismissedAccount(account.address);
     }
   };
 
-  useEffect(() => {
-    if (!origin || !account) return;
-    const hasDismissed = localStorage.getItem(
-      getDismissKey(account.address, origin.full)
-    );
-    setDismissed(!!hasDismissed);
-  }, [account, origin]);
-
   return (
     <Box
       css={styles.wrapper}
-      data-open={status === ConnectionStatus.OtherAccount && !dismissed}
+      data-open={status === ConnectionStatus.OtherAccount && !isDismissed}
     >
       <Alert status="info" css={styles.alert}>
         <Alert.Description as="div">

packages/app/src/systems/Transaction/components/TxFee/TxFeeLoader.tsx

@@ -6,9 +6,6 @@ import { styles } from './styles';
 
 export const TxFeeLoader = (props: ContentLoaderProps) => (
   <Card css={styles.detailItem()}>
-    <Text color="intentsBase11" css={styles.title}>
-      Fee (network)
-    </Text>
     <TxFeeAmountLoader {...props} />
   </Card>
 );