@privy-io/react-auth 1.2.2 → 1.2.3-beta.1

package/dist/index.js

@@ -50,6 +50,10 @@ var ErrorCodes = {
     message: "Signature rejected",
     detail: "Please try connecting again."
   },
+  ERROR_TIMED_OUT: {
+    message: "Could not log in with wallet",
+    detail: "Please try connecting again."
+  },
   ERROR_WALLET_CONNECTION: {
     message: "Could not log in with wallet",
     detail: "Please try connecting again."
@@ -91,10 +95,17 @@ var PrivyConnectorError = class extends PrivyError {
     this.type = "connector_error";
   }
 };
-var SiweSignatureRejectedError = class extends PrivyError {
+var WalletTimeoutError = class extends PrivyError {
   constructor() {
-    super("Sign-in request rejected.");
+    super("Wallet timeout");
+    this.type = "wallet_error";
+  }
+};
+var SiweSignatureFailedError = class extends PrivyError {
+  constructor(reason) {
+    super(`Sign-in request ${reason || "timed out" /* TIMED_OUT */}.`);
     this.type = "siwe_error";
+    this.reason = reason || "rejected" /* REJECTED */;
   }
 };
 var wrapApiError = (error) => {
@@ -479,7 +490,7 @@ var SUPPORTED_WALLET_TYPES = ["metamask", "coinbase_wallet", "wallet_connect"];
 // src/connector.ts
 var WALLET_TYPE_STORAGE_KEY = "privy:wallet_type";
 var DEFAULT_WALLET_TIMEOUT_MS = 1e4;
-var walletTimeout = (error = new Error("Wallet timeout"), timeoutMs = DEFAULT_WALLET_TIMEOUT_MS) => new Promise(
+var walletTimeout = (error = new WalletTimeoutError(), timeoutMs = DEFAULT_WALLET_TIMEOUT_MS) => new Promise(
   (_, reject) => setTimeout(() => {
     reject(error);
   }, timeoutMs)
@@ -626,8 +637,9 @@ Resources:
       new AsExternalProvider(this.getEthereumProvider())
     );
     const signer = ethersProvider.getSigner();
-    return Promise.race([signer.signMessage(message), walletTimeout()]).catch(() => {
-      throw new SiweSignatureRejectedError();
+    return Promise.race([signer.signMessage(message), walletTimeout()]).catch((e) => {
+      const reason = e instanceof WalletTimeoutError ? "timed out" /* TIMED_OUT */ : "rejected" /* REJECTED */;
+      throw new SiweSignatureFailedError(reason);
     });
   }
   prepareMessage(chainId, address, nonce) {
@@ -1058,10 +1070,12 @@ var ModalHeader = ({ backFn }) => {
     ]
   });
 };
-var MiniModalHeader = () => {
+var MiniModalHeader = ({ backFn }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(StyledHeader, {
     children: [
-      /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(Placeholder, {}),
+      backFn ? /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(BackButton, {
+        backFn
+      }) : /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(Placeholder, {}),
       /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(Placeholder, {}),
       /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(CancelButton, {})
     ]
@@ -5569,8 +5583,7 @@ var LaterButton2 = import_styled_components12.default.button`
 var import_react10 = require("react");
 var import_styled_components13 = __toESM(require("styled-components"));
 var import_jsx_runtime25 = require("react/jsx-runtime");
-var MAX_RETRIES = 1;
-var GO_BACK_DELAY_MS = 2e3;
+var MAX_RETRIES = 2;
 var WalletMapping = {
   metamask: {
     name: "MetaMask",
@@ -5589,7 +5602,7 @@ var ConnectionStatusScreen = () => {
   var _a;
   const [success, setSuccess] = (0, import_react10.useState)(false);
   const [errorCode, setErrorCode] = (0, import_react10.useState)(void 0);
-  const { navigate } = usePrivyModal();
+  const { navigate, navigateBack } = usePrivyModal();
   const { getAuthMeta, closePrivyModal, loginWithWallet } = usePrivyInternal();
   const [numRetries, setNumRetries] = (0, import_react10.useState)(0);
   const { user } = usePrivy();
@@ -5599,8 +5612,12 @@ var ConnectionStatusScreen = () => {
       console.error(e);
       if ((e == null ? void 0 : e.status) === 422) {
         setErrorCode(ErrorCodes.ERROR_USER_EXISTS);
-      } else if (e instanceof SiweSignatureRejectedError) {
-        setErrorCode(ErrorCodes.ERROR_SIGNATURE_REJECTED);
+      } else if (e instanceof SiweSignatureFailedError) {
+        if (e.reason === "timed out" /* TIMED_OUT */) {
+          setErrorCode(ErrorCodes.ERROR_TIMED_OUT);
+        } else {
+          setErrorCode(ErrorCodes.ERROR_SIGNATURE_REJECTED);
+        }
       } else {
         setErrorCode(ErrorCodes.ERROR_WALLET_CONNECTION);
       }
@@ -5624,21 +5641,29 @@ var ConnectionStatusScreen = () => {
   const walletType = ((_a = getAuthMeta()) == null ? void 0 : _a.wallet) || "metamask";
   const walletName = WalletMapping[walletType].name;
   const WalletLogo = WalletMapping[walletType].component;
+  const isRetryableError = errorCode === ErrorCodes.ERROR_WALLET_CONNECTION || errorCode === ErrorCodes.ERROR_SIGNATURE_REJECTED || errorCode === ErrorCodes.ERROR_TIMED_OUT;
   const title = success ? `Successfully connected with ${walletName}` : errorCode ? errorCode.message : `Waiting for ${walletName}`;
-  const walletInstructions = (walletType2) => {
-    switch (walletType2) {
+  let subtitle = "";
+  if (success) {
+    subtitle = "You\u2019re good to go!";
+  } else if (numRetries >= MAX_RETRIES && errorCode) {
+    subtitle = "Unable to connect wallet";
+  } else if (errorCode) {
+    subtitle = errorCode.detail;
+  } else {
+    switch (walletType) {
       case "wallet_connect":
-        return "Open your mobile wallet app to continue";
-      case "coinbase_wallet":
-        return `Don't see the signature request? Check your other browser windows.`;
+        subtitle = "Open your mobile wallet app to continue";
+        break;
       default:
-        return `Don't see the signature request?`;
+        subtitle = `Don\u2019t see your wallet modal? Check your other browser windows.`;
     }
-  };
-  const subtitle = success ? "You\u2019re good to go!" : errorCode ? errorCode.detail : walletInstructions(walletType);
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(import_jsx_runtime25.Fragment, {
     children: [
-      /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(MiniModalHeader, {}),
+      /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(MiniModalHeader, {
+        backFn: navigateBack
+      }),
       /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(ConnectContainer4, {
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(StackedContainer, {
@@ -5664,10 +5689,13 @@ var ConnectionStatusScreen = () => {
               })
             ]
           }),
-          !success ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(RetryOrBackButton, {
-            errorCode,
-            numRetries,
-            setNumRetries
+          !success ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(CallToActionButton, {
+            onClick: () => {
+              setNumRetries(numRetries + 1);
+              setErrorCode(void 0);
+            },
+            visible: isRetryableError && numRetries < MAX_RETRIES,
+            children: "Retry"
           }) : null
         ]
       }),
@@ -5675,32 +5703,6 @@ var ConnectionStatusScreen = () => {
     ]
   });
 };
-var RetryOrBackButton = ({
-  errorCode,
-  numRetries,
-  setNumRetries
-}) => {
-  const { navigateBack } = usePrivyModal();
-  const [showCallToAction, setCallToAction] = (0, import_react10.useState)(false);
-  (0, import_react10.useEffect)(() => {
-    const timer = setTimeout(() => {
-      setCallToAction(true);
-    }, GO_BACK_DELAY_MS);
-    return () => clearTimeout(timer);
-  }, []);
-  const isRetryableError = errorCode === ErrorCodes.ERROR_WALLET_CONNECTION || errorCode === ErrorCodes.ERROR_SIGNATURE_REJECTED;
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, {
-    children: (!errorCode || isRetryableError) && numRetries < MAX_RETRIES ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(CallToActionButton, {
-      onClick: () => setNumRetries(numRetries + 1),
-      visible: showCallToAction,
-      children: "Retry"
-    }) : /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(CallToActionButton, {
-      onClick: navigateBack,
-      visible: showCallToAction,
-      children: "Go back"
-    })
-  });
-};
 var ConnectContainer4 = import_styled_components13.default.div`
   display: flex;
   flex-direction: column;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@privy-io/react-auth",
-  "version": "1.2.2",
+  "version": "1.2.3-beta.1",
   "description": "React client for the Privy Auth API",
   "keywords": [
     "authentication",