diff --git a/.prettierrc b/.prettierrc index 7e1cf5e..7e05f5f 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,4 @@ { "tabWidth": 2, - "printWidth": 100 + "printWidth": 80 } diff --git a/src/pages/Modals/ConnectVaultModal/components/A2_SignStep.tsx b/src/pages/Modals/ConnectVaultModal/components/A2_SignStep.tsx index 443471c..abc01ad 100644 --- a/src/pages/Modals/ConnectVaultModal/components/A2_SignStep.tsx +++ b/src/pages/Modals/ConnectVaultModal/components/A2_SignStep.tsx @@ -115,10 +115,13 @@ export default function SignStep({ } } } catch (e) { - Sentry.captureException(e); + const eventId = Sentry.captureException(e); console.error(e); notificationAdded({ - text: "En error occurred, please clean your cache and refresh your page.", + text: + "En error occurred, please clean your cache and refresh your page." + + " - Error id: " + + eventId, type: "error", }); } diff --git a/src/pages/Modals/ConnectVaultModal/components/AccessRecoveryKey.tsx b/src/pages/Modals/ConnectVaultModal/components/AccessRecoveryKey.tsx index bc9623b..cf77d21 100644 --- a/src/pages/Modals/ConnectVaultModal/components/AccessRecoveryKey.tsx +++ b/src/pages/Modals/ConnectVaultModal/components/AccessRecoveryKey.tsx @@ -74,9 +74,12 @@ export default function AccessRecoveryKey({ onConnected }: Props): JSX.Element { setNoVaultFound(true); } } catch (e) { - Sentry.captureException(e); + const eventId = Sentry.captureException(e); notificationAdded({ - text: "En error occurred, please clean your cache and refresh your page.", + text: + "En error occurred, please clean your cache and refresh your page." + + " - Error id: " + + eventId, type: "error", }); } diff --git a/src/pages/Modals/ConnectVaultModal/components/B1_CreateVaultStep.tsx b/src/pages/Modals/ConnectVaultModal/components/B1_CreateVaultStep.tsx index 5b3ed12..79a473d 100644 --- a/src/pages/Modals/ConnectVaultModal/components/B1_CreateVaultStep.tsx +++ b/src/pages/Modals/ConnectVaultModal/components/B1_CreateVaultStep.tsx @@ -206,15 +206,19 @@ export default function CreateVaultStep({ await create(ownershipSignature, seed, identifier); onCreated(); } catch (e) { + let eventId: string; Sentry.withScope(function (scope) { scope.setLevel("fatal"); - Sentry.captureException(e); + eventId = Sentry.captureException(e); }); console.error(e); setStatus("idle"); notificationAdded({ type: "error", - text: "An error occurred, while importing new owner", + text: + "An error occurred, while importing new owner" + + " - Error id: " + + eventId, }); } }; diff --git a/src/pages/Modals/ConnectVaultModal/components/B2_VaultDetectedStep.tsx b/src/pages/Modals/ConnectVaultModal/components/B2_VaultDetectedStep.tsx index 1e8721b..fd5c5a4 100644 --- a/src/pages/Modals/ConnectVaultModal/components/B2_VaultDetectedStep.tsx +++ b/src/pages/Modals/ConnectVaultModal/components/B2_VaultDetectedStep.tsx @@ -104,10 +104,13 @@ export default function VaultDetectedStep({ throw new Error(); } } catch (e) { - Sentry.captureException(e); + const eventId = Sentry.captureException(e); console.error(e); notificationAdded({ - text: "En error occurred, please clean your cache and refresh your page.", + text: + "En error occurred, please clean your cache and refresh your page." + + " - Error id: " + + eventId, type: "error", }); } diff --git a/src/pages/Modals/GenerateRecoveryKey/index.tsx b/src/pages/Modals/GenerateRecoveryKey/index.tsx index 1a4835d..285ebff 100644 --- a/src/pages/Modals/GenerateRecoveryKey/index.tsx +++ b/src/pages/Modals/GenerateRecoveryKey/index.tsx @@ -99,13 +99,17 @@ export default function GenerateRecoveryKeyModal(): JSX.Element { setKey(_key); setName(_name); } catch (e) { + let eventId: string; Sentry.withScope(function (scope) { scope.setLevel("fatal"); - Sentry.captureException(e); + eventId = Sentry.captureException(e); }); console.log("e", e); notificationAdded({ - text: "An error occurred while saving your vault, please try again.", + text: + "An error occurred while saving your vault, please try again." + + " - Error id: " + + eventId, type: "error", }); } finally { diff --git a/src/pages/Modals/ImportAccount/provider/index.tsx b/src/pages/Modals/ImportAccount/provider/index.tsx index 6c2a97a..f387e30 100644 --- a/src/pages/Modals/ImportAccount/provider/index.tsx +++ b/src/pages/Modals/ImportAccount/provider/index.tsx @@ -85,14 +85,19 @@ export default function ImportAccountModalProvider({ setAccountTypes(null); }; - const triggerError = (e) => { + const triggerError = (e: Error) => { + let eventId: string; Sentry.withScope(function (scope) { scope.setLevel("fatal"); - Sentry.captureException(e?.response?.data); + eventId = Sentry.captureException(e); }); console.error(e); + const text = e?.message + ? e.message + : "An error occurred while saving your vault, please try again."; + notificationAdded({ - text: "An error occurred while saving your vault, please try again.", + text: text + " - Error id: " + eventId, type: "error", }); setImporting(null); @@ -124,7 +129,7 @@ export default function ImportAccountModalProvider({ if (_importType === "owner") { if (alreadyOwner) { - triggerError("Already imported as Owner"); + triggerError(new Error("Account already imported as Owner")); return; } await vault.addOwner({ @@ -157,13 +162,17 @@ export default function ImportAccountModalProvider({ commitmentReceipt = _commitmentReceipt; commitmentMapperPubKey = _commitmentMapperPubKey; } catch (e) { + let eventId: string; Sentry.withScope(function (scope) { scope.setLevel("fatal"); - Sentry.captureException(e?.response?.data); + eventId = Sentry.captureException(e); }); console.error(e); notificationAdded({ - text: "Account already imported into another vault.", + text: + "Account already imported into another vault." + + " - Error id: " + + eventId, type: "error", }); setImporting(null); @@ -173,7 +182,7 @@ export default function ImportAccountModalProvider({ if (_importType === "account") { if (alreadyImported) { - triggerError("Already imported"); + triggerError(new Error("Account already imported")); return; } await vault.importAccount({ @@ -241,12 +250,16 @@ export default function ImportAccountModalProvider({ e?.response?.data?.error === "Address is already used for a commitment!" ) { console.error(e); + let eventId: string; Sentry.withScope(function (scope) { scope.setLevel("fatal"); - Sentry.captureException(e?.response?.data); + eventId = Sentry.captureException(e); }); notificationAdded({ - text: "Telegram account already imported in this vault or in another one", + text: + "Telegram account already imported in this vault or in another one" + + " - Error id: " + + eventId, type: "error", }); setImporting(null); @@ -302,12 +315,16 @@ export default function ImportAccountModalProvider({ e?.response?.data?.error === "Address is already used for a commitment!" ) { console.error(e); + let eventId: string; Sentry.withScope(function (scope) { scope.setLevel("fatal"); - Sentry.captureException(e?.response?.data); + eventId = Sentry.captureException(e); }); notificationAdded({ - text: "Github account already imported in this vault or in another one", + text: + "Github account already imported in this vault or in another one" + + " - Error id: " + + eventId, type: "error", }); setImporting(null); @@ -365,12 +382,16 @@ export default function ImportAccountModalProvider({ e?.response?.data?.error === "Address is already used for a commitment!" ) { console.error(e); + let eventId: string; Sentry.withScope(function (scope) { scope.setLevel("fatal"); - Sentry.captureException(e?.response?.data); + eventId = Sentry.captureException(e); }); notificationAdded({ - text: "Twitter account already imported in this vault or in another one", + text: + "Twitter account already imported in this vault or in another one" + + " - Error id: " + + eventId, type: "error", }); setImporting(null); @@ -427,12 +448,16 @@ export default function ImportAccountModalProvider({ e?.response?.data?.error === "Address is already used for a commitment!" ) { console.error(e); + let eventId: string; Sentry.withScope(function (scope) { scope.setLevel("fatal"); - Sentry.captureException(e?.response?.data); + eventId = Sentry.captureException(e); }); notificationAdded({ - text: "Twitter account already imported in this vault or in another one", + text: + "Twitter account already imported in this vault or in another one" + + " - Error id: " + + eventId, type: "error", }); setImporting(null); diff --git a/src/pages/Modals/MyVault/Settings/components/Customize.tsx b/src/pages/Modals/MyVault/Settings/components/Customize.tsx index 6f8c7e3..f46c93c 100644 --- a/src/pages/Modals/MyVault/Settings/components/Customize.tsx +++ b/src/pages/Modals/MyVault/Settings/components/Customize.tsx @@ -63,14 +63,17 @@ export default function Customize() { setEditIsOpen(false); } catch (e) { console.error("Update name", e); - Sentry.captureException(e, { + const eventId = Sentry.captureException(e, { tags: { file: "Customization.tsx", function: "saveNewName", }, }); notificationAdded({ - text: "An error occurred while saving your vault, please try again.", + text: + "An error occurred while saving your vault, please try again." + + " - Error id: " + + eventId, type: "error", }); } finally { diff --git a/src/pages/Modals/MyVault/Settings/components/Security.tsx b/src/pages/Modals/MyVault/Settings/components/Security.tsx index cea7e58..8a75438 100644 --- a/src/pages/Modals/MyVault/Settings/components/Security.tsx +++ b/src/pages/Modals/MyVault/Settings/components/Security.tsx @@ -43,9 +43,12 @@ export default function Security() { try { await vault.setKeepConnected(vault.connectedOwner, !vault.keepConnected); } catch (e) { - Sentry.captureException(e); + const eventId = Sentry.captureException(e); notificationAdded({ - text: "An error occurred while saving your vault, please try again.", + text: + "An error occurred while saving your vault, please try again." + + " - Error id: " + + eventId, type: "error", }); } finally {