Merge remote-tracking branch 'origin/feat/aml' into tmp/20241101

RabbyHub · Oct 30, 2024 · 6a80149 · 6a80149
2 parents 6ec7847 + 01972fd
commit 6a80149
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/ui/views/GasAccount/components/LoginPopup.tsx b/src/ui/views/GasAccount/components/LoginPopup.tsx
@@ -79,7 +79,7 @@ const GasAccountLoginContent = ({ onClose }: { onClose: () => void }) => {
           {t('page.gasAccount.loginConfirmModal.title')}
         </div>
         <GasACcountCurrentAddress />
-        <div className=" text-14 text-r-neutral-body px-20">
+        <div className=" text-14 text-r-neutral-body px-20 text-center">
           {t('page.gasAccount.loginConfirmModal.desc')}
         </div>
         <div

diff --git a/src/ui/views/GasAccount/components/SwitchLoginAddrModal.tsx b/src/ui/views/GasAccount/components/SwitchLoginAddrModal.tsx
@@ -34,6 +34,7 @@ export const SwitchLoginAddrBeforeDepositModal = ({
         paddingLeft: 20,
         paddingRight: 20,
       }}
+      focusTriggerAfterClose={false}
     >
       <div className="flex flex-col items-center">
         <div className="text-18 font-medium text-r-neutral-title1">

diff --git a/src/ui/views/Swap/Component/Header.tsx b/src/ui/views/Swap/Component/Header.tsx
@@ -12,6 +12,7 @@ import { useTranslation } from 'react-i18next';
 import { useRabbyDispatch } from '@/ui/store';
 import { PendingTx } from '../../Bridge/Component/PendingTx';
 import { RabbyFeePopup } from './RabbyFeePopup';
+import { useHistory } from 'react-router-dom';
 
 export const Header = () => {
   const [historyVisible, setHistoryVisible] = useState(false);
@@ -25,6 +26,11 @@ export const Header = () => {
   const openHistory = useCallback(() => {
     setHistoryVisible(true);
   }, []);
+  const history = useHistory();
+
+  const gotoDashboard = () => {
+    history.push('/dashboard');
+  };
 
   const dispath = useRabbyDispatch();
 
@@ -37,6 +43,7 @@ export const Header = () => {
       <PageHeader
         className="mx-[20px] pt-[20px] mb-[14px]"
         forceShowBack
+        onBack={gotoDashboard}
         rightSlot={
           <div className="flex items-center gap-20 absolute bottom-0 right-0">
             {loadingNumber ? (

diff --git a/src/ui/views/Swap/Component/LowCreditModal.tsx b/src/ui/views/Swap/Component/LowCreditModal.tsx
@@ -87,6 +87,7 @@ export const LowCreditModal = ({
         paddingLeft: 20,
         paddingRight: 20,
       }}
+      focusTriggerAfterClose={false}
     >
       <div className="flex flex-col">
         <div className="flex items-center justify-center">
@@ -103,7 +104,7 @@ export const LowCreditModal = ({
           {ellipsisAddress(token.id)}
           <RcIconExternalCC className="w-14 h-14 text-r-neutral-body" />
         </div>
-        <div className="mt-16 mb-12 text-16 font-medium text-r-neutral-title1 text-center">
+        <div className="mt-16 mb-12 text-[16px] font-medium text-r-neutral-title1 text-center">
           {t('page.swap.lowCreditModal.title')}
         </div>
         <div className="mb-32 rounded-md p-10 pr-[9px] bg-r-neutral-card2 text-12 text-r-neutral-foot">