diff --git a/apps/dcellar-web-ui/src/modules/accounts/components/AccountDetail.tsx b/apps/dcellar-web-ui/src/modules/accounts/components/AccountDetail.tsx
index 0cc66830..71112117 100644
--- a/apps/dcellar-web-ui/src/modules/accounts/components/AccountDetail.tsx
+++ b/apps/dcellar-web-ui/src/modules/accounts/components/AccountDetail.tsx
@@ -53,7 +53,7 @@ export const AccountDetail = ({ loading, title, accountDetail, availableBalance
};
const detailItems = [
{
- label: 'Account Address',
+ label: 'Account address',
value: (
diff --git a/apps/dcellar-web-ui/src/modules/accounts/components/PaymentAccountDetail.tsx b/apps/dcellar-web-ui/src/modules/accounts/components/PaymentAccountDetail.tsx
index 7c2f513f..05b7fad5 100644
--- a/apps/dcellar-web-ui/src/modules/accounts/components/PaymentAccountDetail.tsx
+++ b/apps/dcellar-web-ui/src/modules/accounts/components/PaymentAccountDetail.tsx
@@ -1,11 +1,7 @@
import { DCButton } from '@/components/common/DCButton';
import { DCDrawer } from '@/components/common/DCDrawer';
import { useAppDispatch, useAppSelector } from '@/store';
-import {
- selectAccount,
- setEditPaymentDetail,
- setupAccountDetail,
-} from '@/store/slices/accounts';
+import { selectAccount, setEditPaymentDetail, setupAccountDetail } from '@/store/slices/accounts';
import { Flex, QDrawerFooter } from '@totejs/uikit';
import { useAsyncEffect, useInterval } from 'ahooks';
import React, { useEffect } from 'react';
@@ -71,25 +67,25 @@ export const PaymentAccountDetail = () => {
/>
- {!isLoadingDetail && isNonRefundable && !isFrozen && (
+ {!isLoadingDetail && (
onAction('withdraw')}
+ borderColor="#e6e8ea"
+ gaClickName="dc.file.f_detail_pop.download.click"
+ onClick={() => onAction('deposit')}
>
- Withdraw
+ Deposit
)}
- {!isLoadingDetail && (
+ {!isLoadingDetail && isNonRefundable && !isFrozen && (
onAction('deposit')}
+ gaClickName="dc.file.f_detail_pop.share.click"
+ onClick={() => onAction('withdraw')}
>
- Deposit
+ Withdraw
)}
{/* {!isLoadingDetail && isNonRefundable && (
diff --git a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/Calculator.tsx b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/Calculator.tsx
index 9ba475d4..010ea197 100644
--- a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/Calculator.tsx
+++ b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/Calculator.tsx
@@ -511,6 +511,7 @@ export const Calculator = ({ storeParams, bnbPrice, gasFee }: CalculatorProps) =
<>
{item.id !== 'custom' && (
- *1 month=30 day
+ *1 month=30 day
diff --git a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/CustomTime.tsx b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/CustomTime.tsx
index 68685624..04cab27a 100644
--- a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/CustomTime.tsx
+++ b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/CustomTime.tsx
@@ -65,6 +65,7 @@ export const CustomTime = ({
onChangeButton();
onToggle();
}}
+ borderRadius={4}
gaClickName={gaClickName}
sx={{
[smMedia]: {
diff --git a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/SPFreeQuota.tsx b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/SPFreeQuota.tsx
index 7ee72b75..93f9bb44 100644
--- a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/SPFreeQuota.tsx
+++ b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/SPFreeQuota.tsx
@@ -53,7 +53,7 @@ export const SPFreeQuota = ({ sps }: SPFreeQuotaProps) => (
alignItems={'center'}
color={'readable.normal'}
>
-
+
{item.name}
diff --git a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/SizeMenu.tsx b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/SizeMenu.tsx
index 16290726..a41a9fbe 100644
--- a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/SizeMenu.tsx
+++ b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/SizeMenu.tsx
@@ -1,63 +1,64 @@
-
import { smMedia } from '@/modules/responsive';
import { MenuCloseIcon, MenuOpenIcon } from '@totejs/icons';
import { Button, ButtonProps, Menu, MenuButton, MenuItem, MenuList } from '@totejs/uikit';
-import React from 'react'
+import React from 'react';
type Props = {
value: string;
sizes: string[];
onItemClick: (item: string) => void;
buttonStyles?: ButtonProps;
-}
+};
-export const SizeMenu = ({value, sizes, onItemClick, buttonStyles = {}}: Props)=> {
+export const SizeMenu = ({ value, sizes, onItemClick, buttonStyles = {} }: Props) => {
return (
- )
-}
+ {...buttonStyles}
+ >
+ {value}
+
+
+ {sizes.map((item) => (
+
+ ))}
+
+ >
+ )}
+
+ );
+};
diff --git a/apps/dcellar-web-ui/src/modules/wallet/Send/index.tsx b/apps/dcellar-web-ui/src/modules/wallet/Send/index.tsx
index 2fa14620..43c31f08 100644
--- a/apps/dcellar-web-ui/src/modules/wallet/Send/index.tsx
+++ b/apps/dcellar-web-ui/src/modules/wallet/Send/index.tsx
@@ -342,20 +342,22 @@ export const Send = () => {
loading={loadingToAccount}
onChange={(e) => onChangeToAccount(e)}
/>
-
- Balance on Greenfield:{' '}
- {loadingToAccount ? (
-
- ) : (
- renderFee(toBalance, exchangeRate + '')
- )}
-
+ {accountTypes[toAccount.address] !== 'gnfd_account' && (
+
+ Balance on Greenfield:{' '}
+ {loadingToAccount ? (
+
+ ) : (
+ renderFee(toBalance, exchangeRate + '')
+ )}
+
+ )}
{toErrors && toErrors.map((error, index) => {error})}