From 8d46a39f51f4359d8630b87bcc7cb444bf175030 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 28 Oct 2022 17:47:02 +0800
Subject: [PATCH] Fix bug in adding the Readwise connection, open Readwise API
 page in a new window.

---
 .../components/templates/integrations/Readwise.tsx    | 11 ++++++-----
 .../networking/mutations/setIntegrationMutation.ts    |  8 ++------
 packages/web/pages/settings/integrations.tsx          |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/web/components/templates/integrations/Readwise.tsx b/packages/web/components/templates/integrations/Readwise.tsx
index 3a64b0f56..5e471abe8 100644
--- a/packages/web/components/templates/integrations/Readwise.tsx
+++ b/packages/web/components/templates/integrations/Readwise.tsx
@@ -56,11 +56,11 @@ export function Readwise(): JSX.Element {
         <Header>Readwise</Header>
       </HStack>
 
-      {!isValidating && readwiseIntegration && (
+      {readwiseIntegration && (
         <RemoveReadwiseForm integration={readwiseIntegration} revalidate={revalidate} />
       )}
 
-      {!isValidating && !readwiseIntegration && (
+      {!readwiseIntegration && (
         <AddReadwiseForm />
       )}
 
@@ -104,13 +104,14 @@ function AddReadwiseForm(): JSX.Element {
       }}
     >
       <SpanBox>Enter your API key from Readwise below. You can get your token{' '}
-      <Link
+      <a
+        target='_blank'
+        referrerPolicy='no-referrer'
         style={{ color: '$utilityTextDefault' }}
         href="https://readwise.io/access_token"
-        target="_blank"
       >
         here
-      </Link>.</SpanBox>
+      </a>.</SpanBox>
     </HStack>
 
     <FormInput
diff --git a/packages/web/lib/networking/mutations/setIntegrationMutation.ts b/packages/web/lib/networking/mutations/setIntegrationMutation.ts
index 8b387ac9d..cae1ff341 100644
--- a/packages/web/lib/networking/mutations/setIntegrationMutation.ts
+++ b/packages/web/lib/networking/mutations/setIntegrationMutation.ts
@@ -14,12 +14,8 @@ type SetIntegrationResult = {
 }
 
 type SetIntegrationData = {
-  setIntegration?: SetIntegrationSuccess
-  errorCodes?: unknown[]
-}
-
-type SetIntegrationSuccess = {
   integration: Integration
+  errorCodes?: unknown[]
 }
 
 type Integration = {
@@ -64,5 +60,5 @@ export async function setIntegrationMutation(
       throw 'Your token is invalid.'
     throw error
   }
-  return output.setIntegration?.setIntegration?.integration
+  return output.setIntegration?.integration
 }
diff --git a/packages/web/pages/settings/integrations.tsx b/packages/web/pages/settings/integrations.tsx
index d417abd68..479e11f67 100644
--- a/packages/web/pages/settings/integrations.tsx
+++ b/packages/web/pages/settings/integrations.tsx
@@ -92,7 +92,7 @@ export default function Integrations(): JSX.Element {
       },
       {
         icon: '/static/icons/readwise.svg',
-        title: 'ReadWise',
+        title: 'Readwise',
         subText:
           'Readwise makes it easy to revisit and learn from your ebook & article highlights. Use our Readwise integration to sync your highlights from Omnivore to Readwise.',
         button: {