@blocklet/launcher-ux 2.3.49 → 2.3.51

package/es/payment/checkout/on-demand.js

@@ -93,6 +93,10 @@ function Component({
   minStakeAmount,
   isResume
 }) {
+  const theme = useTheme();
+  const {
+    isMobile
+  } = useMobile();
   const {
     getCurrency,
     getMethod
@@ -101,16 +105,9 @@ function Component({
     unitPrice: '',
     totalPrice: '',
     minStakeAmount: '',
-    shouldStake: true
+    shouldStake: true,
+    freeTrial: null
   });
-  const {
-    isMobile
-  } = useMobile();
-  const theme = useTheme();
-  const {
-    isFreeTrial,
-    duration: freeTrialDurationSeconds
-  } = getProductFreeTrial('serverless', freeTrialProducts);
   const minimumWidth = useMediaQuery(theme.breakpoints.down(540));
   const components = (tempComponents || []).reduce((acc, x) => {
     if (acc.findIndex(y => y.did === x.did) === -1) {
@@ -164,11 +161,17 @@ function Component({
       let unitPrice = formatPrice(price, currency, UNIT_LABEL_PLACEHOLDER, 1, true, locale);
       unitPrice = unitPrice?.replace(new RegExp(`${UNIT_LABEL_PLACEHOLDER}\\s+\\/*`), '');
       const paymentMethod = getMethod(paymentMethodId);
+      const freeTrial = getProductFreeTrial({
+        typeName: 'serverless',
+        freeTrialProducts,
+        currencyId: currency.id
+      });
       setState({
         unitPrice,
         totalPrice,
         minStakeAmount: `${minStakeAmount} ${currency.symbol}`,
-        shouldStake: paymentMethod?.type === 'arcblock'
+        shouldStake: paymentMethod?.type === 'arcblock',
+        freeTrial
       });
     } catch (error) {
       console.error('calculate failed error', error);
@@ -181,7 +184,7 @@ function Component({
       width: '100%',
       height: '100%'
     },
-    children: [isFreeTrial && /*#__PURE__*/_jsx(Box, {
+    children: [state.freeTrial && /*#__PURE__*/_jsx(Box, {
       sx: {
         display: 'flex',
         justifyContent: 'flex-start'
@@ -189,7 +192,7 @@ function Component({
       children: /*#__PURE__*/_jsx(Chip, {
         icon: /*#__PURE__*/_jsx(RocketLaunchIcon, {}),
         label: t('checkout.freeTrialHint', {
-          duration: prettyMs(freeTrialDurationSeconds * 1000, {
+          duration: prettyMs(state.freeTrial.duration * 1000, {
             locale: locale === 'zh' ? 'zh_CN' : 'en_US',
             compact: true,
             verbose: true,
@@ -336,10 +339,10 @@ function Component({
               value: state.minStakeAmount,
               highlight: false
             }, {
-              label: isFreeTrial ? t('checkout.estimatedCostFreeTrial') : t('checkout.estimatedCost'),
+              label: state.isFreeTrial ? t('checkout.estimatedCostFreeTrial') : t('checkout.estimatedCost'),
               value: state.totalPrice,
               hint: t('checkout.estimatedCostHint'),
-              highlight: isFreeTrial
+              highlight: state.isFreeTrial
             }].map(item => {
               if (!item) {
                 return null;

package/lib/payment/checkout/on-demand.js

@@ -106,6 +106,10 @@ function Component(_ref2) {
     minStakeAmount,
     isResume
   } = _ref2;
+  const theme = (0, _styles.useTheme)();
+  const {
+    isMobile
+  } = (0, _useMobile.default)();
   const {
     getCurrency,
     getMethod
@@ -114,16 +118,9 @@ function Component(_ref2) {
     unitPrice: '',
     totalPrice: '',
     minStakeAmount: '',
-    shouldStake: true
+    shouldStake: true,
+    freeTrial: null
   });
-  const {
-    isMobile
-  } = (0, _useMobile.default)();
-  const theme = (0, _styles.useTheme)();
-  const {
-    isFreeTrial,
-    duration: freeTrialDurationSeconds
-  } = (0, _util.getProductFreeTrial)('serverless', freeTrialProducts);
   const minimumWidth = (0, _useMediaQuery.default)(theme.breakpoints.down(540));
   const components = (tempComponents || []).reduce((acc, x) => {
     if (acc.findIndex(y => y.did === x.did) === -1) {
@@ -179,11 +176,17 @@ function Component(_ref2) {
       let unitPrice = (0, _paymentReact.formatPrice)(price, currency, UNIT_LABEL_PLACEHOLDER, 1, true, locale);
       unitPrice = (_unitPrice = unitPrice) === null || _unitPrice === void 0 ? void 0 : _unitPrice.replace(new RegExp("".concat(UNIT_LABEL_PLACEHOLDER, "\\s+\\/*")), '');
       const paymentMethod = getMethod(paymentMethodId);
+      const freeTrial = (0, _util.getProductFreeTrial)({
+        typeName: 'serverless',
+        freeTrialProducts,
+        currencyId: currency.id
+      });
       setState({
         unitPrice,
         totalPrice,
         minStakeAmount: "".concat(minStakeAmount, " ").concat(currency.symbol),
-        shouldStake: (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.type) === 'arcblock'
+        shouldStake: (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.type) === 'arcblock',
+        freeTrial
       });
     } catch (error) {
       console.error('calculate failed error', error);
@@ -196,7 +199,7 @@ function Component(_ref2) {
       width: '100%',
       height: '100%'
     },
-    children: [isFreeTrial && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+    children: [state.freeTrial && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       sx: {
         display: 'flex',
         justifyContent: 'flex-start'
@@ -204,7 +207,7 @@ function Component(_ref2) {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, {
         icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RocketLaunch.default, {}),
         label: t('checkout.freeTrialHint', {
-          duration: (0, _prettyMsI18n.default)(freeTrialDurationSeconds * 1000, {
+          duration: (0, _prettyMsI18n.default)(state.freeTrial.duration * 1000, {
             locale: locale === 'zh' ? 'zh_CN' : 'en_US',
             compact: true,
             verbose: true,
@@ -352,10 +355,10 @@ function Component(_ref2) {
               value: state.minStakeAmount,
               highlight: false
             }, {
-              label: isFreeTrial ? t('checkout.estimatedCostFreeTrial') : t('checkout.estimatedCost'),
+              label: state.isFreeTrial ? t('checkout.estimatedCostFreeTrial') : t('checkout.estimatedCost'),
               value: state.totalPrice,
               hint: t('checkout.estimatedCostHint'),
-              highlight: isFreeTrial
+              highlight: state.isFreeTrial
             }].map(item => {
               if (!item) {
                 return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-ux",
-  "version": "2.3.49",
+  "version": "2.3.51",
   "description": "Launcher UX lib",
   "publishConfig": {
     "access": "public"
@@ -54,8 +54,8 @@
   },
   "dependencies": {
     "@arcblock/ux": "^2.10.23",
-    "@blocklet/launcher-util": "2.3.49",
-    "@blocklet/payment-react": "^1.14.32",
+    "@blocklet/launcher-util": "2.3.51",
+    "@blocklet/payment-react": "^1.14.34",
     "@emotion/styled": "^11.13.0",
     "@mui/icons-material": "^5.16.7",
     "@mui/material": "^5.16.7",
@@ -93,5 +93,5 @@
       "require": "./lib/use-mobile/index.js"
     }
   },
-  "gitHead": "823c6e1af3fb5e3f8bb4cc451bc7667fcc8a235e"
+  "gitHead": "73a28e39959b50167e326ed83161fb4dc6cd09f7"
 }