@blocklet/payment-react 1.13.237 → 1.13.238

package/es/payment/form/index.js

@@ -5,7 +5,7 @@ import { useTheme } from "@arcblock/ux/lib/Theme";
 import Toast from "@arcblock/ux/lib/Toast";
 import { LoadingButton } from "@mui/lab";
 import { Fade, InputAdornment, Stack, Typography } from "@mui/material";
-import { useCreation, useSetState, useSize } from "ahooks";
+import { useCreation, useMemoizedFn, useSetState, useSize } from "ahooks";
 import { PhoneNumberUtil } from "google-libphonenumber";
 import pWaitFor from "p-wait-for";
 import { useEffect, useState } from "react";
@@ -99,6 +99,17 @@ export default function PaymentForm({
     }
     return false;
   }, [domSize, theme]);
+  const afterUserLoggedIn = useMemoizedFn(() => {
+    if (hasDidWallet(session.user)) {
+      handleSubmit(onFormSubmit, onFormError)();
+    } else {
+      session.bindWallet(() => {
+        setTimeout(() => {
+          handleSubmit(onFormSubmit, onFormError)();
+        }, 2e3);
+      });
+    }
+  });
   const payee = getStatementDescriptor(checkoutSession.line_items);
   let buttonText = "";
   if (paymentLink?.donation_settings) {
@@ -237,19 +248,7 @@ export default function PaymentForm({
     } else {
       session?.login(() => {
         setState({ submitting: true });
-        onUserLoggedIn().then(() => {
-          if (hasDidWallet(session.user)) {
-            setTimeout(() => {
-              handleSubmit(onFormSubmit, onFormError)();
-            }, 80);
-          } else {
-            session.bindWallet(() => {
-              setTimeout(() => {
-                handleSubmit(onFormSubmit, onFormError)();
-              }, 2e3);
-            });
-          }
-        }).catch((err) => {
+        onUserLoggedIn().then(afterUserLoggedIn).catch((err) => {
           console.error(err);
           setState({ submitting: false });
         });

package/lib/payment/form/index.js

@@ -121,6 +121,17 @@ function PaymentForm({
     }
     return false;
   }, [domSize, theme]);
+  const afterUserLoggedIn = (0, _ahooks.useMemoizedFn)(() => {
+    if (hasDidWallet(session.user)) {
+      handleSubmit(onFormSubmit, onFormError)();
+    } else {
+      session.bindWallet(() => {
+        setTimeout(() => {
+          handleSubmit(onFormSubmit, onFormError)();
+        }, 2e3);
+      });
+    }
+  });
   const payee = (0, _util.getStatementDescriptor)(checkoutSession.line_items);
   let buttonText = "";
   if (paymentLink?.donation_settings) {
@@ -292,19 +303,7 @@ function PaymentForm({
         setState({
           submitting: true
         });
-        onUserLoggedIn().then(() => {
-          if (hasDidWallet(session.user)) {
-            setTimeout(() => {
-              handleSubmit(onFormSubmit, onFormError)();
-            }, 80);
-          } else {
-            session.bindWallet(() => {
-              setTimeout(() => {
-                handleSubmit(onFormSubmit, onFormError)();
-              }, 2e3);
-            });
-          }
-        }).catch(err => {
+        onUserLoggedIn().then(afterUserLoggedIn).catch(err => {
           console.error(err);
           setState({
             submitting: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.13.237",
+  "version": "1.13.238",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -90,7 +90,7 @@
     "@babel/core": "^7.24.4",
     "@babel/preset-env": "^7.24.4",
     "@babel/preset-react": "^7.24.1",
-    "@blocklet/payment-types": "1.13.237",
+    "@blocklet/payment-types": "1.13.238",
     "@storybook/addon-essentials": "^7.6.17",
     "@storybook/addon-interactions": "^7.6.17",
     "@storybook/addon-links": "^7.6.17",
@@ -119,5 +119,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
-  "gitHead": "895430a130d53b62707f4f78c5295b06ce55d4db"
+  "gitHead": "3476a64bdb10cf042551f55f087c5e1b30717894"
 }

package/src/payment/form/index.tsx

@@ -6,7 +6,7 @@ import Toast from '@arcblock/ux/lib/Toast';
 import type { TCustomer, TPaymentIntent, TPaymentMethodExpanded } from '@blocklet/payment-types';
 import { LoadingButton } from '@mui/lab';
 import { Fade, InputAdornment, Stack, Typography } from '@mui/material';
-import { useCreation, useSetState, useSize } from 'ahooks';
+import { useCreation, useMemoizedFn, useSetState, useSize } from 'ahooks';
 import { PhoneNumberUtil } from 'google-libphonenumber';
 import pWaitFor from 'p-wait-for';
 import { useEffect, useState } from 'react';
@@ -146,6 +146,19 @@ export default function PaymentForm({
     return false;
   }, [domSize, theme]);
 
+  const afterUserLoggedIn = useMemoizedFn(() => {
+    if (hasDidWallet(session.user)) {
+      handleSubmit(onFormSubmit, onFormError)();
+    } else {
+      session.bindWallet(() => {
+        // timeout required because https://github.com/ArcBlock/ux/issues/1241
+        setTimeout(() => {
+          handleSubmit(onFormSubmit, onFormError)();
+        }, 2000);
+      });
+    }
+  });
+
   const payee = getStatementDescriptor(checkoutSession.line_items);
   let buttonText = '';
   if (paymentLink?.donation_settings) {
@@ -294,20 +307,7 @@ export default function PaymentForm({
       session?.login(() => {
         setState({ submitting: true });
         onUserLoggedIn()
-          .then(() => {
-            if (hasDidWallet(session.user)) {
-              setTimeout(() => {
-                handleSubmit(onFormSubmit, onFormError)();
-              }, 80);
-            } else {
-              session.bindWallet(() => {
-                // timeout required because https://github.com/ArcBlock/ux/issues/1241
-                setTimeout(() => {
-                  handleSubmit(onFormSubmit, onFormError)();
-                }, 2000);
-              });
-            }
-          })
+          .then(afterUserLoggedIn)
           .catch((err) => {
             console.error(err);
             setState({ submitting: false });