@blocklet/launcher-ux 2.3.36 → 2.3.38

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

@@ -89,12 +89,14 @@ function Component({
   minStakeAmount
 }) {
   const {
-    getCurrency
+    getCurrency,
+    getMethod
   } = usePaymentContext();
   const [state, setState] = useSetState({
     unitPrice: '',
     totalPrice: '',
-    minStakeAmount: ''
+    minStakeAmount: '',
+    shouldStake: true
   });
   const {
     isMobile
@@ -145,7 +147,8 @@ function Component({
     price
   } = checkoutState.value;
   const handleChange = ({
-    payment_currency: currencyId
+    payment_currency: currencyId,
+    payment_method: paymentMethodId
   } = {}) => {
     try {
       const currency = getCurrency(currencyId);
@@ -154,10 +157,12 @@ function Component({
       totalPrice = totalPrice?.replace(new RegExp(`${UNIT_LABEL_PLACEHOLDER}\\s+\\/*`), '');
       let unitPrice = formatPrice(price, currency, UNIT_LABEL_PLACEHOLDER, 1, true, locale);
       unitPrice = unitPrice?.replace(new RegExp(`${UNIT_LABEL_PLACEHOLDER}\\s+\\/*`), '');
+      const paymentMethod = getMethod(paymentMethodId);
       setState({
         unitPrice,
         totalPrice,
-        minStakeAmount: `${minStakeAmount} ${currency.symbol}`
+        minStakeAmount: `${minStakeAmount} ${currency.symbol}`,
+        shouldStake: paymentMethod?.type === 'arcblock'
       });
     } catch (error) {
       console.error('calculate failed error', error);
@@ -181,7 +186,8 @@ function Component({
           duration: prettyMs(freeTrialDurationSeconds * 1000, {
             locale: locale === 'zh' ? 'zh_CN' : 'en_US',
             compact: true,
-            verbose: false
+            verbose: true,
+            unitCount: 1
           })
         }),
         color: "success",
@@ -319,7 +325,7 @@ function Component({
           }), /*#__PURE__*/_jsx(List, {
             dense: true,
             disablePadding: true,
-            children: [{
+            children: [state.shouldStake && {
               label: t('checkout.stakeAmount'),
               value: state.minStakeAmount,
               highlight: false
@@ -329,6 +335,9 @@ function Component({
               hint: t('checkout.estimatedCostHint'),
               highlight: isFreeTrial
             }].map(item => {
+              if (!item) {
+                return null;
+              }
               return /*#__PURE__*/_jsx(ListItem, {
                 disablePadding: true,
                 disableGutters: true,
@@ -391,7 +400,7 @@ function Component({
                 })
               }, item.label);
             })
-          }), /*#__PURE__*/_jsx(Alert, {
+          }), state.shouldStake && /*#__PURE__*/_jsx(Alert, {
             severity: "info",
             sx: {
               mt: 2,

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

@@ -102,12 +102,14 @@ function Component(_ref2) {
     minStakeAmount
   } = _ref2;
   const {
-    getCurrency
+    getCurrency,
+    getMethod
   } = (0, _paymentReact.usePaymentContext)();
   const [state, setState] = (0, _ahooks.useSetState)({
     unitPrice: '',
     totalPrice: '',
-    minStakeAmount: ''
+    minStakeAmount: '',
+    shouldStake: true
   });
   const {
     isMobile
@@ -159,7 +161,8 @@ function Component(_ref2) {
   } = checkoutState.value;
   const handleChange = function handleChange() {
     let {
-      payment_currency: currencyId
+      payment_currency: currencyId,
+      payment_method: paymentMethodId
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     try {
       var _totalPrice, _unitPrice;
@@ -169,10 +172,12 @@ function Component(_ref2) {
       totalPrice = (_totalPrice = totalPrice) === null || _totalPrice === void 0 ? void 0 : _totalPrice.replace(new RegExp("".concat(UNIT_LABEL_PLACEHOLDER, "\\s+\\/*")), '');
       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);
       setState({
         unitPrice,
         totalPrice,
-        minStakeAmount: "".concat(minStakeAmount, " ").concat(currency.symbol)
+        minStakeAmount: "".concat(minStakeAmount, " ").concat(currency.symbol),
+        shouldStake: (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.type) === 'arcblock'
       });
     } catch (error) {
       console.error('calculate failed error', error);
@@ -196,7 +201,8 @@ function Component(_ref2) {
           duration: (0, _prettyMsI18n.default)(freeTrialDurationSeconds * 1000, {
             locale: locale === 'zh' ? 'zh_CN' : 'en_US',
             compact: true,
-            verbose: false
+            verbose: true,
+            unitCount: 1
           })
         }),
         color: "success",
@@ -335,7 +341,7 @@ function Component(_ref2) {
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.List, {
             dense: true,
             disablePadding: true,
-            children: [{
+            children: [state.shouldStake && {
               label: t('checkout.stakeAmount'),
               value: state.minStakeAmount,
               highlight: false
@@ -345,6 +351,9 @@ function Component(_ref2) {
               hint: t('checkout.estimatedCostHint'),
               highlight: isFreeTrial
             }].map(item => {
+              if (!item) {
+                return null;
+              }
               return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.ListItem, {
                 disablePadding: true,
                 disableGutters: true,
@@ -407,7 +416,7 @@ function Component(_ref2) {
                 })
               }, item.label);
             })
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Alert, {
+          }), state.shouldStake && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Alert, {
             severity: "info",
             sx: {
               mt: 2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-ux",
-  "version": "2.3.36",
+  "version": "2.3.38",
   "description": "Launcher UX lib",
   "publishConfig": {
     "access": "public"
@@ -54,8 +54,8 @@
   },
   "dependencies": {
     "@arcblock/ux": "^2.10.12",
-    "@blocklet/launcher-util": "2.3.36",
-    "@blocklet/payment-react": "^1.14.8",
+    "@blocklet/launcher-util": "2.3.38",
+    "@blocklet/payment-react": "^1.14.11",
     "@emotion/styled": "^11.13.0",
     "@mui/icons-material": "^5.16.6",
     "@mui/material": "^5.16.6",
@@ -93,5 +93,5 @@
       "require": "./lib/use-mobile/index.js"
     }
   },
-  "gitHead": "55fe474e79787d4314b3e6be089e9aef5036e58b"
+  "gitHead": "e0bc571eb6b0c54e0180312515b85663d90e06f8"
 }