Merge remote-tracking branch 'origin/alpha' into alpha

web/src/components/table/ChannelsTable.js

@@ -6,9 +6,9 @@ import {
   showSuccess,
   timestamp2string,
   renderGroup,
-  renderNumberWithPoint,
   renderQuota,
-  getChannelIcon
+  getChannelIcon,
+  renderQuotaWithAmount
 } from '../../helpers/index.js';
 
 import {
@@ -256,7 +256,7 @@ const ChannelsTable = () => {
                     {renderQuota(record.used_quota)}
                   </Tag>
                 </Tooltip>
-                <Tooltip content={t('剩余额度') + record.balance + t('，点击更新')}>
+                <Tooltip content={t('剩余额度$') + record.balance + t('，点击更新')}>
                   <Tag
                     color='white'
                     type='ghost'
@@ -265,7 +265,7 @@ const ChannelsTable = () => {
                     prefixIcon={<Coins size={14} />}
                     onClick={() => updateChannelBalance(record)}
                   >
-                    ${renderNumberWithPoint(record.balance)}
+                    {renderQuotaWithAmount(record.balance)}
                   </Tag>
                 </Tooltip>
               </Space>

web/src/helpers/render.js

@@ -854,7 +854,7 @@ export function renderQuotaWithAmount(amount) {
   if (displayInCurrency) {
     return '$' + amount;
   } else {
-    return renderUnitWithQuota(amount);
+    return renderNumber(renderUnitWithQuota(amount));
   }
 }