payment-kit 1.18.20 → 1.18.22

package/src/libs/util.ts

@@ -21,9 +21,8 @@ import { hexToNumber } from '@ocap/util';
 import { isEmpty, isObject } from 'lodash';
 import cloneDeep from 'lodash/cloneDeep';
 import isEqual from 'lodash/isEqual';
-import { joinURL, withQuery } from 'ufo';
+import { joinURL } from 'ufo';
 
-import type { LiteralUnion } from 'type-fest';
 import { t } from '../locales/index';
 
 export const formatProductPrice = (
@@ -327,22 +326,6 @@ export function getInvoiceUsageReportStartEnd(invoice: TInvoiceExpanded, showPre
   return usageReportRange;
 }
 
-export function getCustomerProfileUrl({
-  locale = 'en',
-  userDid,
-}: {
-  locale: LiteralUnion<'en' | 'zh', string>;
-  userDid: string;
-}) {
-  return joinURL(
-    getPrefix(),
-    withQuery('.well-known/service/user', {
-      locale,
-      did: userDid,
-    })
-  );
-}
-
 export function getAppInfo(address: string): { name: string; avatar: string; type: string; url: string } | null {
   const blockletJson = window.blocklet;
   if (blockletJson) {

package/src/pages/admin/payments/payouts/detail.tsx

@@ -12,6 +12,7 @@ import {
   formatTime,
   getCustomerAvatar,
   getPayoutStatusColor,
+  getUserProfileLink,
   useMobile,
 } from '@blocklet/payment-react';
 import type { TCustomer, TPayoutExpanded } from '@blocklet/payment-types';
@@ -30,7 +31,7 @@ import InfoRow from '../../../../components/info-row';
 import MetadataEditor from '../../../../components/metadata/editor';
 import MetadataList from '../../../../components/metadata/list';
 import SectionHeader from '../../../../components/section/header';
-import { getAppInfo, getCustomerProfileUrl, goBackOrFallback } from '../../../../libs/util';
+import { getAppInfo, goBackOrFallback } from '../../../../libs/util';
 import InfoCard from '../../../../components/info-card';
 import InfoRowGroup from '../../../../components/info-row-group';
 
@@ -48,7 +49,7 @@ const InfoDirection = 'column';
 const InfoAlignItems = 'flex-start';
 
 export default function PayoutDetail(props: { id: string }) {
-  const { t } = useLocaleContext();
+  const { t, locale } = useLocaleContext();
   const { isMobile } = useMobile();
   const [state, setState] = useSetState({
     adding: {
@@ -227,10 +228,7 @@ export default function PayoutDetail(props: { id: string }) {
                           if (isAnonymousPayer) {
                             return;
                           }
-                          const url = getCustomerProfileUrl({
-                            userDid: paymentIntent?.customer?.did,
-                            locale: 'zh',
-                          });
+                          const url = getUserProfileLink(paymentIntent?.customer?.did, locale);
                           window.open(url, '_blank');
                         }}>
                         {paymentIntent?.customer?.name}

package/src/pages/customer/index.tsx

@@ -35,7 +35,7 @@ import { styled } from '@mui/system';
 import { useRequest, useSetState } from 'ahooks';
 import { flatten, isEmpty } from 'lodash';
 import { memo, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { joinURL } from 'ufo';
 
 import { useTransitionContext } from '../../components/progress-bar';
@@ -251,6 +251,8 @@ export default function CustomerHome() {
       }))
     )
   );
+  const [params] = useSearchParams();
+  const embed = params.get('embed') || sessionStorage.getItem('embed');
 
   const { livemode, setLivemode } = usePaymentContext();
   const [state, setState] = useSetState({
@@ -515,7 +517,7 @@ export default function CustomerHome() {
               color="error"
               component="a"
               size="small"
-              href={joinURL(getPrefix(), '/customer/invoice/past-due')}
+              href={joinURL(getPrefix(), '/customer/invoice/past-due', `${embed === '1' ? '?embed=1' : ''}`)}
               target="_blank"
               rel="noreferrer"
               style={{ textDecoration: 'none', fontSize: 13 }}>

package/src/pages/customer/payout/detail.tsx

@@ -9,6 +9,7 @@ import {
   formatTime,
   getCustomerAvatar,
   getPayoutStatusColor,
+  getUserProfileLink,
   useMobile,
 } from '@blocklet/payment-react';
 import type { TCustomer, TPaymentLink, TPayoutExpanded } from '@blocklet/payment-types';
@@ -22,7 +23,7 @@ import DID from '@arcblock/ux/lib/DID';
 import InfoMetric from '../../../components/info-metric';
 import InfoRow from '../../../components/info-row';
 import SectionHeader from '../../../components/section/header';
-import { getCustomerProfileUrl, goBackOrFallback } from '../../../libs/util';
+import { goBackOrFallback } from '../../../libs/util';
 import CustomerLink from '../../../components/customer/link';
 import InfoCard from '../../../components/info-card';
 import InfoRowGroup from '../../../components/info-row-group';
@@ -39,7 +40,7 @@ const fetchData = (
 };
 
 export default function PayoutDetail() {
-  const { t } = useLocaleContext();
+  const { t, locale } = useLocaleContext();
   const { isMobile } = useMobile();
   const params = useParams<{ id: string }>();
   const { loading, error, data } = useRequest(() => fetchData(params.id!), {
@@ -178,10 +179,7 @@ export default function PayoutDetail() {
                         if (isAnonymousPayer) {
                           return;
                         }
-                        const url = getCustomerProfileUrl({
-                          userDid: paymentIntent?.customer?.did,
-                          locale: 'zh',
-                        });
+                        const url = getUserProfileLink(paymentIntent?.customer?.did, locale);
                         window.open(url, '_blank');
                       }}>
                       {paymentIntent?.customer?.name}