From 67ef446d6bed004845d82947988d884018fc992d Mon Sep 17 00:00:00 2001 From: jadapema Date: Wed, 29 Jan 2025 10:53:49 -0600 Subject: [PATCH 1/3] fix: transfer modal from profile and change "transfer" with "send" --- .../activate-subscription-profile-modal.tsx | 9 +++- src/components/follow-unfollow-button.tsx | 2 +- src/components/subscribe-profile-modal.tsx | 10 +++-- .../finance-quick-transfer-modal.tsx | 44 ++++++++++++++----- .../components/finance-quick-transfer.tsx | 2 +- src/sections/user/profile-join.tsx | 2 +- src/sections/user/profile-transfer.tsx | 4 +- 7 files changed, 51 insertions(+), 22 deletions(-) diff --git a/src/components/activate-subscription-profile-modal.tsx b/src/components/activate-subscription-profile-modal.tsx index d5ca6a9b9..ee680e118 100644 --- a/src/components/activate-subscription-profile-modal.tsx +++ b/src/components/activate-subscription-profile-modal.tsx @@ -227,7 +227,14 @@ export const ActivateSubscriptionProfileModal = ({ - + { diff --git a/src/components/subscribe-profile-modal.tsx b/src/components/subscribe-profile-modal.tsx index c5d8d0b67..d6b3f14b4 100644 --- a/src/components/subscribe-profile-modal.tsx +++ b/src/components/subscribe-profile-modal.tsx @@ -290,10 +290,12 @@ export const SubscribeProfileModal = ({ state.auth.session); const { generatePayload } = useNotificationPayload(sessionData); const { transfer, loading: transferLoading, error } = useTransfer(); @@ -58,8 +60,7 @@ function FinanceQuickTransferModal({ const [message, setMessage] = useState(''); // For transfer button is clicked in some profile - const balance = useSelector((state: any) => state.auth.balance); - const MAX_AMOUNT = balance; + const MAX_AMOUNT = useSelector((state: any) => state.auth.balance); const [value, setValue] = useState(0); const [canContinue, setCanContinue] = useState(true); @@ -165,7 +166,13 @@ function FinanceQuickTransferModal({ return ( - Transfer to + + Send to + - + - + 0)} loading={transferLoading} > Confirm diff --git a/src/sections/finance/components/finance-quick-transfer.tsx b/src/sections/finance/components/finance-quick-transfer.tsx index efca0d98e..14ec6bc61 100644 --- a/src/sections/finance/components/finance-quick-transfer.tsx +++ b/src/sections/finance/components/finance-quick-transfer.tsx @@ -367,7 +367,7 @@ export default function FinanceQuickTransfer({ disabled={amount === 0 || !isValidAddress(walletAddress) || !canContinue} onClick={confirm.onTrue} > - Quick transfer + Quick send ); diff --git a/src/sections/user/profile-join.tsx b/src/sections/user/profile-join.tsx index 3da984051..ca0056570 100644 --- a/src/sections/user/profile-join.tsx +++ b/src/sections/user/profile-join.tsx @@ -31,7 +31,7 @@ const ProfileJoin: FC = ({profile, profileJoinProps}) => { title={hasAccess ? 'Joined' : 'Join'} variant={hasAccess ? 'outlined' : 'contained'} sx={{ - minWidth: 120, + minWidth: { xs: 90, md: 120 }, backgroundColor: hasAccess ? '#24262A' : '#fff', }} onClick={handleSubscription} diff --git a/src/sections/user/profile-transfer.tsx b/src/sections/user/profile-transfer.tsx index 795a4bbc3..97e23f72e 100644 --- a/src/sections/user/profile-transfer.tsx +++ b/src/sections/user/profile-transfer.tsx @@ -22,10 +22,10 @@ const ProfileTransfer: FC = ({profile}) => { return ( <> - Transfer + Send Date: Wed, 29 Jan 2025 11:13:19 -0600 Subject: [PATCH 2/3] fix: sonarcloud --- .../finance/components/finance-quick-transfer-modal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sections/finance/components/finance-quick-transfer-modal.tsx b/src/sections/finance/components/finance-quick-transfer-modal.tsx index 6fe4c896b..e529b6a8f 100644 --- a/src/sections/finance/components/finance-quick-transfer-modal.tsx +++ b/src/sections/finance/components/finance-quick-transfer-modal.tsx @@ -236,7 +236,7 @@ function FinanceQuickTransferModal({ variant="contained" sx={{ backgroundColor: '#fff' }} onClick={handleConfirmTransfer} - disabled={transferLoading || !canContinue || !(amount > 0)} + disabled={transferLoading || !canContinue || value <= 0} loading={transferLoading} > Confirm From d4143c96e90a1444dd127c5e2ee99700d62c9644 Mon Sep 17 00:00:00 2001 From: jadapema Date: Wed, 29 Jan 2025 11:24:21 -0600 Subject: [PATCH 3/3] fix: text send --- src/sections/finance/components/finance-quick-transfer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sections/finance/components/finance-quick-transfer.tsx b/src/sections/finance/components/finance-quick-transfer.tsx index 14ec6bc61..0ed635384 100644 --- a/src/sections/finance/components/finance-quick-transfer.tsx +++ b/src/sections/finance/components/finance-quick-transfer.tsx @@ -367,7 +367,7 @@ export default function FinanceQuickTransfer({ disabled={amount === 0 || !isValidAddress(walletAddress) || !canContinue} onClick={confirm.onTrue} > - Quick send + Send );