@privy-io/react-auth 1.2.2 → 1.3.0-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) {
@@ -839,20 +851,10 @@ var EmailFlow = class {
 };
 
 // src/mobile.ts
-var isMobile = (userAgent) => {
-  if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(
-    userAgent
-  ) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
-    userAgent.substr(0, 4)
-  )) {
-    return true;
-  } else {
-    return false;
-  }
-};
+var import_react_device_detect = require("react-device-detect");
 var mobileRedirect = (walletType) => {
   const currentURL = new URL(window.location.href);
-  if (!window.ethereum && isMobile(navigator.userAgent || navigator.vendor || window.opera)) {
+  if (!window.ethereum && import_react_device_detect.isMobile) {
     let url = void 0;
     switch (walletType) {
       case "metamask":
@@ -1058,10 +1060,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, {})
     ]
@@ -1303,6 +1307,7 @@ var WalletConnect = ({ style, ...props }) => {
 };
 
 // src/components/ConnectWalletButtons.tsx
+var import_react_device_detect2 = require("react-device-detect");
 var import_jsx_runtime9 = require("react/jsx-runtime");
 var ConnectWalletButtons = () => {
   const { navigate } = usePrivyModal();
@@ -1311,7 +1316,7 @@ var ConnectWalletButtons = () => {
     children: [
       /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(ConnectWalletButton, {
         onClick: () => {
-          if (isMetamaskInstalled()) {
+          if (isMetamaskInstalled() || import_react_device_detect2.isMobile) {
             initLoginWithWallet("metamask");
             navigate("AWAITING_CONNECTION" /* AWAITING_CONNECTION */);
           } else {
@@ -1324,13 +1329,13 @@ var ConnectWalletButtons = () => {
             children: "Metamask"
           }),
           /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", {
-            children: isMetamaskInstalled() ? "Connect" : "Install"
+            children: isMetamaskInstalled() || import_react_device_detect2.isMobile ? "Connect" : "Install"
           })
         ]
       }),
       /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(ConnectWalletButton, {
         onClick: () => {
-          if (isCoinbaseWalletInstalled()) {
+          if (isCoinbaseWalletInstalled() || import_react_device_detect2.isMobile) {
             initLoginWithWallet("coinbase_wallet");
             navigate("AWAITING_CONNECTION" /* AWAITING_CONNECTION */);
           } else {
@@ -1343,7 +1348,7 @@ var ConnectWalletButtons = () => {
             children: "Coinbase Wallet"
           }),
           /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", {
-            children: isCoinbaseWalletInstalled() ? "Connect" : "Install"
+            children: isCoinbaseWalletInstalled() || import_react_device_detect2.isMobile ? "Connect" : "Install"
           })
         ]
       }),
@@ -5170,14 +5175,14 @@ var WalletEducation = ({ style, ...props }) => {
 };
 
 // src/screens/WalletEducationScreen.tsx
-var import_react_device_detect = require("react-device-detect");
+var import_react_device_detect3 = require("react-device-detect");
 var import_jsx_runtime23 = require("react/jsx-runtime");
 var WalletEducationScreen = () => {
   const [activeView, setActiveView] = (0, import_react8.useState)("WHAT_IS_A_WALLET" /* WHAT_IS_A_WALLET */);
   const { navigateBack, navigate } = usePrivyModal();
   const backFn = activeView === "WHAT_IS_A_WALLET" /* WHAT_IS_A_WALLET */ ? navigateBack : activeView === "PICK_A_NEW_WALLET" /* PICK_A_NEW_WALLET */ ? () => setActiveView("WHAT_IS_A_WALLET" /* WHAT_IS_A_WALLET */) : () => setActiveView("PICK_A_NEW_WALLET" /* PICK_A_NEW_WALLET */);
   let extensionStoreLink;
-  if (import_react_device_detect.isFirefox) {
+  if (import_react_device_detect3.isFirefox) {
     extensionStoreLink = "https://addons.mozilla.org/en-US/firefox/addon/ether-metamask/";
   } else {
     extensionStoreLink = "https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn?hl=en";
@@ -5569,8 +5574,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 +5593,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 +5603,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 +5632,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 +5680,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 +5694,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.3.0-beta.1",
   "description": "React client for the Privy Auth API",
   "keywords": [
     "authentication",