From e48cd6172122662c3a27f1d4e59db9da4e4d5590 Mon Sep 17 00:00:00 2001
From: Keyan <34140557+huumn@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:56:29 -0500
Subject: [PATCH] remove unused fields from me fragment (#1466)

---
 fragments/users.js      | 28 +++-------------------------
 pages/settings/index.js | 12 ++++++------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/fragments/users.js b/fragments/users.js
index dfdb2df6..8e0f9203 100644
--- a/fragments/users.js
+++ b/fragments/users.js
@@ -15,31 +15,16 @@ export const ME = gql`
         diagnostics
         noReferralLinks
         fiatCurrency
+        autoWithdrawMaxFeePercent
+        autoWithdrawThreshold
+        withdrawMaxFeeDefault
         satsFilter
-        hideCowboyHat
         hideFromTopUsers
-        hideGithub
-        hideNostr
-        hideTwitter
-        hideInvoiceDesc
-        hideIsContributor
         hideWalletBalance
         hideWelcomeBanner
         imgproxyOnly
         showImagesAndVideos
-        lastCheckedJobs
         nostrCrossposting
-        noteAllDescendants
-        noteCowboyHat
-        noteDeposits
-        noteWithdrawals
-        noteEarning
-        noteForwardedSats
-        noteInvites
-        noteItemSats
-        noteJobIndicator
-        noteMentions
-        noteItemMentions
         sats
         tipDefault
         tipRandom
@@ -50,19 +35,12 @@ export const ME = gql`
         zapUndos
         upvotePopover
         wildWestMode
-        withdrawMaxFeeDefault
-        lnAddr
-        autoWithdrawMaxFeePercent
-        autoWithdrawThreshold
         disableFreebies
       }
       optional {
         isContributor
         stacked
         streak
-        githubId
-        nostrAuthPubkey
-        twitterId
       }
     }
   }`
diff --git a/pages/settings/index.js b/pages/settings/index.js
index 10f043e2..a5e72eb7 100644
--- a/pages/settings/index.js
+++ b/pages/settings/index.js
@@ -385,14 +385,14 @@ export default function Settings ({ ssrData }) {
             groupClassName='mb-0'
           />
           <Checkbox
-            disabled={me.optional.githubId === null}
+            disabled={!settings?.authMethods?.github}
             label={
               <div className='d-flex align-items-center'>hide my linked github profile
                 <Info>
                   <ul>
                     <li>Linked accounts are hidden from your profile by default</li>
                     <li>uncheck this to display your github on your profile</li>
-                    {me.optional.githubId === null &&
+                    {!settings?.authMethods?.github &&
                       <div className='my-2'>
                         <li><i>You don't seem to have a linked github account</i></li>
                         <ul><li>If this is wrong, try unlinking/relinking</li></ul>
@@ -405,14 +405,14 @@ export default function Settings ({ ssrData }) {
             groupClassName='mb-0'
           />
           <Checkbox
-            disabled={me.optional.nostrAuthPubkey === null}
+            disabled={!settings?.authMethods?.nostr}
             label={
               <div className='d-flex align-items-center'>hide my linked nostr profile
                 <Info>
                   <ul>
                     <li>Linked accounts are hidden from your profile by default</li>
                     <li>Uncheck this to display your npub on your profile</li>
-                    {me.optional.nostrAuthPubkey === null &&
+                    {!settings?.authMethods?.nostr &&
                       <div className='my-2'>
                         <li>You don't seem to have a linked nostr account</li>
                         <ul><li>If this is wrong, try unlinking/relinking</li></ul>
@@ -425,14 +425,14 @@ export default function Settings ({ ssrData }) {
             groupClassName='mb-0'
           />
           <Checkbox
-            disabled={me.optional.twitterId === null}
+            disabled={!settings?.authMethods?.twitter}
             label={
               <div className='d-flex align-items-center'>hide my linked twitter profile
                 <Info>
                   <ul>
                     <li>Linked accounts are hidden from your profile by default</li>
                     <li>Uncheck this to display your twitter on your profile</li>
-                    {me.optional.twitterId === null &&
+                    {!settings?.authMethods?.twitter &&
                       <div className='my-2'>
                         <i>You don't seem to have a linked twitter account</i>
                         <ul><li>If this is wrong, try unlinking/relinking</li></ul>