Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web

2025-10-30 10:37:02 +09:00
parent 51f8079b9a 2553aca4de
commit 8b79f83382
35 changed files with 467 additions and 512 deletions
--- a/src/entities/settlement/ui/info-wrap/amount-info-wrap.tsx
+++ b/src/entities/settlement/ui/info-wrap/amount-info-wrap.tsx
@@ -22,13 +22,7 @@ export const AmountInfoWrap = ({
            <li className="kv-row">
              <span className="k">{t('settlement.totalTransactionAmount')}</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.totalTransactionAmount }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.totalTransactionAmount || 0) })}
                <NumericFormat
                  value={ amountInfo?.totalTransactionCount }
                  thousandSeparator
@@ -41,13 +35,7 @@ export const AmountInfoWrap = ({
                <li>
                  <span>·&nbsp;&nbsp;{t('settlement.creditCard')}</span>
                  <span className="unset-child-span">
-                    <NumericFormat
-                      value={ amountInfo?.creditCardAmount }
-                      thousandSeparator
-                      displayType="text"
-                      prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                      suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                    ></NumericFormat>
+                    {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.creditCardAmount || 0) })}
                    <NumericFormat
                      value={ amountInfo?.creditCardCount }
                      thousandSeparator
@@ -60,13 +48,7 @@ export const AmountInfoWrap = ({
                <li>
                  <span>·&nbsp;&nbsp;{t('settlement.accountTransfer')}</span>
                  <span className="unset-child-span">
-                    <NumericFormat
-                      value={ amountInfo?.accountTransferAmount }
-                      thousandSeparator
-                      displayType="text"
-                      prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                      suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                    ></NumericFormat>
+                    {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.accountTransferAmount || 0) })}
                    <NumericFormat
                      value={ amountInfo?.accountTransferCount }
                      thousandSeparator
@@ -177,97 +159,49 @@ export const AmountInfoWrap = ({
            <li className="kv-row">
              <span className="k">{t('settlement.transactionAmount')}</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.transactionAmount }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.transactionAmount || 0) })}
              </span>
            </li>
            <li className="kv-row">
              <span className="k">{t('settlement.paymentFee')}</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.paymentFee }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.paymentFee || 0) })}
              </span>
            </li>
            <li className="kv-row">
              <span className="k">{t('settlement.escrowFee')}</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.escrowFee }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.escrowFee || 0) })}
              </span>
            </li>
            <li className="kv-row">
              <span className="k">{t('settlement.authFee')}</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.authFee }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.authFee || 0) })}
              </span>
            </li>
            <li className="kv-row">
              <span className="k">VAT</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.vatFee }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.vatFee || 0) })}
              </span>
            </li>
            <li className="kv-row">
              <span className="k">{t('settlement.expectedSettlementAmount')}</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.settlementAmount }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.settlementAmount || 0) })}
              </span>
            </li>
            <li className="kv-row">
              <span className="k">{t('settlement.preSettlementCancelOffset')}</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.preSettlementCancelOffset }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.preSettlementCancelOffset || 0) })}
              </span>
            </li>
            <li className="kv-row bolder">
              <span className="k">{t('settlement.settlementAmount')}</span>
              <span className="v">
-                <NumericFormat
-                  value={ amountInfo?.finalSettlementAmount }
-                  thousandSeparator
-                  displayType="text"
-                  prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-                  suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-                ></NumericFormat>
+                {t('home.money', { value: new Intl.NumberFormat('en-US').format(amountInfo?.finalSettlementAmount || 0) })}
              </span>
            </li>
          </ul>
--- a/src/entities/settlement/ui/list-item.tsx
+++ b/src/entities/settlement/ui/list-item.tsx
@@ -65,15 +65,7 @@ export const ListItem = ({
          }
        </div>
        <div className="transaction-amount">
-          {
-            <NumericFormat
-              value={ settlementAmount || transactionAmount }
-              thousandSeparator
-              displayType="text"
-              prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-              suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-            ></NumericFormat>
-          }
+          {t('home.money', { value: new Intl.NumberFormat('en-US').format(settlementAmount || transactionAmount || 0) })}
        </div>
      </div>
    </>
--- a/src/entities/settlement/ui/list-wrap.tsx
+++ b/src/entities/settlement/ui/list-wrap.tsx
@@ -391,13 +391,7 @@ export const ListWrap = ({
        <div className="summary-label label">{t('settlement.settlementAmount')}</div>
        <div className="summary-amount divTop">
          <span className="amount-text">
-            <NumericFormat
-              value={ settlementAmount }
-              thousandSeparator
-              displayType="text"
-              prefix={i18n.language === 'en' ? t('home.currencySymbol') : ''}
-              suffix={i18n.language === 'en' ? '' : t('home.currencyWon')}
-            ></NumericFormat>
+            {t('home.money', { value: new Intl.NumberFormat('en-US').format(settlementAmount || 0) })}
          </span>
          <button
            onClick={ () => setIsOpenSummary(!isOpenSummary) }