From 9418a86453b82d3f05e13e08754158648bd56e63 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Thu, 2 Mar 2023 20:41:23 +0900
Subject: [PATCH 1/4] add delete product feature

---
 .../components/tabs/General.tsx               | 61 ++++++++++++++++---
 .../components/tabs/Proposals.tsx             |  2 +-
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
index 25ef7c0905..ec6ae0918e 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
@@ -197,6 +197,17 @@ const General = () => {
               changes[symbol].new = { ...fileDataParsed[symbol] }
             }
           })
+          // check if any existing symbols are not in uploaded json
+          Object.keys(data).forEach((symbol) => {
+            if (!fileDataParsed[symbol]) {
+              changes[symbol] = { prev: {} }
+              changes[symbol].prev = { ...data[symbol] }
+              changes[symbol].prev.metadata = {
+                ...changes[symbol].prev.metadata,
+                symbol,
+              }
+            }
+          })
           setDataChanges(changes)
           openModal()
         }
@@ -342,6 +353,19 @@ const General = () => {
                 .instruction()
             )
           }
+        } else if (!newChanges) {
+          // if new is undefined, it means that the symbol is deleted
+          // create delete product account instruction
+          instructions.push(
+            await pythProgramClient.methods
+              .delProduct()
+              .accounts({
+                fundingAccount,
+                mappingAccount: rawConfig.mappingAccounts[0].address,
+                productAccount: new PublicKey(prev.address),
+              })
+              .instruction()
+          )
         } else {
           // check if metadata has changed
           if (
@@ -580,6 +604,19 @@ const General = () => {
     )
   }
 
+  const OldPriceFeedsRows = ({ priceFeedData }: { priceFeedData: any }) => {
+    return (
+      <>
+        <tr key={priceFeedData.metadata.symbol}>
+          <td className="base16 py-4 pl-6 pr-2 lg:pl-6">Symbol</td>
+          <td className="base16 py-4 pl-1 pr-2 lg:pl-6">
+            {priceFeedData.metadata.symbol}
+          </td>
+        </tr>
+      </>
+    )
+  }
+
   const ModalContent = ({ changes }: { changes: any }) => {
     return (
       <>
@@ -590,12 +627,16 @@ const General = () => {
               const { prev, new: newChanges } = changes[key]
               const addNewPriceFeed =
                 prev === undefined && newChanges !== undefined
-              const diff = addNewPriceFeed
-                ? []
-                : Object.keys(prev).filter(
-                    (k) =>
-                      JSON.stringify(prev[k]) !== JSON.stringify(newChanges[k])
-                  )
+              const deleteOldPriceFeed =
+                prev !== undefined && newChanges === undefined
+              const diff =
+                addNewPriceFeed || deleteOldPriceFeed
+                  ? []
+                  : Object.keys(prev).filter(
+                      (k) =>
+                        JSON.stringify(prev[k]) !==
+                        JSON.stringify(newChanges[k])
+                    )
               return (
                 <tbody key={key}>
                   <tr>
@@ -603,11 +644,17 @@ const General = () => {
                       className="base16 py-4 pl-6 pr-2 font-bold lg:pl-6"
                       colSpan={2}
                     >
-                      {addNewPriceFeed ? 'Add New Price Feed' : key}
+                      {addNewPriceFeed
+                        ? 'Add New Price Feed'
+                        : deleteOldPriceFeed
+                        ? 'Delete Old Price Feed'
+                        : key}
                     </td>
                   </tr>
                   {addNewPriceFeed ? (
                     <NewPriceFeedsRows key={key} priceFeedData={newChanges} />
+                  ) : deleteOldPriceFeed ? (
+                    <OldPriceFeedsRows key={key} priceFeedData={prev} />
                   ) : (
                     diff.map((k) =>
                       k === 'metadata' ? (
diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
index 50e8802541..524863ee83 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
@@ -402,7 +402,7 @@ const Proposal = ({
             </button>
           </div>
         ) : proposalStatus === 'executeReady' ? (
-          <div className="flex items-center justify-between px-8 pt-3">
+          <div className="flex items-center justify-center space-x-8 pt-3">
             <button
               className="action-btn text-base"
               onClick={handleClickExecute}

From f0bbfc4a247b16bc559d7f686bb37ac909317a70 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Thu, 2 Mar 2023 20:58:48 +0900
Subject: [PATCH 2/4] fix delete product bug

---
 .../xc_admin_frontend/components/tabs/General.tsx     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
index ec6ae0918e..7ec264f382 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
@@ -355,6 +355,17 @@ const General = () => {
           }
         } else if (!newChanges) {
           // if new is undefined, it means that the symbol is deleted
+          // create delete price account instruction
+          instructions.push(
+            await pythProgramClient.methods
+              .delPrice()
+              .accounts({
+                fundingAccount,
+                productAccount: new PublicKey(prev.address),
+                priceAccount: new PublicKey(prev.priceAccounts[0].address),
+              })
+              .instruction()
+          )
           // create delete product account instruction
           instructions.push(
             await pythProgramClient.methods

From e88dd9316b591373c0994d1b6f133b60f443a4b2 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Fri, 3 Mar 2023 10:34:22 +0900
Subject: [PATCH 3/4] refactor

---
 .../components/tabs/General.tsx               | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
index 7ec264f382..ea3033fbe8 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
@@ -202,10 +202,6 @@ const General = () => {
             if (!fileDataParsed[symbol]) {
               changes[symbol] = { prev: {} }
               changes[symbol].prev = { ...data[symbol] }
-              changes[symbol].prev.metadata = {
-                ...changes[symbol].prev.metadata,
-                symbol,
-              }
             }
           })
           setDataChanges(changes)
@@ -468,14 +464,14 @@ const General = () => {
   }
 
   const MetadataChangesRows = ({ changes }: { changes: any }) => {
-    const addNewPriceFeed =
+    const addPriceFeed =
       changes.prev === undefined && changes.new !== undefined
 
     return (
       <>
         {Object.keys(changes.new).map(
           (metadataKey) =>
-            (addNewPriceFeed ||
+            (addPriceFeed ||
               changes.prev[metadataKey] !== changes.new[metadataKey]) && (
               <tr key={metadataKey}>
                 <td className="base16 py-4 pl-6 pr-2 lg:pl-6">
@@ -486,7 +482,7 @@ const General = () => {
                 </td>
 
                 <td className="base16 py-4 pl-1 pr-2 lg:pl-6">
-                  {!addNewPriceFeed ? (
+                  {!addPriceFeed ? (
                     <>
                       <s>{changes.prev[metadataKey]}</s>
                       <br />{' '}
@@ -502,14 +498,14 @@ const General = () => {
   }
 
   const PriceAccountsChangesRows = ({ changes }: { changes: any }) => {
-    const addNewPriceFeed =
+    const addPriceFeed =
       changes.prev === undefined && changes.new !== undefined
     return (
       <>
         {changes.new.map((priceAccount: any, index: number) =>
           Object.keys(priceAccount).map((priceAccountKey) =>
             priceAccountKey === 'publishers' ? (
-              addNewPriceFeed ? (
+              addPriceFeed ? (
                 <PublisherKeysChangesRows
                   key={priceAccountKey}
                   changes={{
@@ -529,7 +525,7 @@ const General = () => {
                 )
               )
             ) : (
-              (addNewPriceFeed ||
+              (addPriceFeed ||
                 changes.prev[index][priceAccountKey] !==
                   priceAccount[priceAccountKey]) && (
                 <tr key={priceAccountKey}>
@@ -540,7 +536,7 @@ const General = () => {
                       .join(' ')}
                   </td>
                   <td className="base16 py-4 pl-1 pr-2 lg:pl-6">
-                    {!addNewPriceFeed ? (
+                    {!addPriceFeed ? (
                       <>
                         <s>{changes.prev[index][priceAccountKey]}</s>
                         <br />
@@ -558,14 +554,14 @@ const General = () => {
   }
 
   const PublisherKeysChangesRows = ({ changes }: { changes: any }) => {
-    const addNewPriceFeed =
+    const addPriceFeed =
       changes.prev === undefined && changes.new !== undefined
-    const publisherKeysToAdd = addNewPriceFeed
+    const publisherKeysToAdd = addPriceFeed
       ? changes.new
       : changes.new.filter(
           (newPublisher: string) => !changes.prev.includes(newPublisher)
         )
-    const publisherKeysToRemove = addNewPriceFeed
+    const publisherKeysToRemove = addPriceFeed
       ? []
       : changes.prev.filter(
           (prevPublisher: string) => !changes.new.includes(prevPublisher)
@@ -636,12 +632,12 @@ const General = () => {
             {/* compare changes.prev and changes.new and display the fields that are different */}
             {Object.keys(changes).map((key) => {
               const { prev, new: newChanges } = changes[key]
-              const addNewPriceFeed =
+              const addPriceFeed =
                 prev === undefined && newChanges !== undefined
-              const deleteOldPriceFeed =
+              const deletePriceFeed =
                 prev !== undefined && newChanges === undefined
               const diff =
-                addNewPriceFeed || deleteOldPriceFeed
+                addPriceFeed || deletePriceFeed
                   ? []
                   : Object.keys(prev).filter(
                       (k) =>
@@ -655,16 +651,16 @@ const General = () => {
                       className="base16 py-4 pl-6 pr-2 font-bold lg:pl-6"
                       colSpan={2}
                     >
-                      {addNewPriceFeed
+                      {addPriceFeed
                         ? 'Add New Price Feed'
-                        : deleteOldPriceFeed
+                        : deletePriceFeed
                         ? 'Delete Old Price Feed'
                         : key}
                     </td>
                   </tr>
-                  {addNewPriceFeed ? (
+                  {addPriceFeed ? (
                     <NewPriceFeedsRows key={key} priceFeedData={newChanges} />
-                  ) : deleteOldPriceFeed ? (
+                  ) : deletePriceFeed ? (
                     <OldPriceFeedsRows key={key} priceFeedData={prev} />
                   ) : (
                     diff.map((k) =>

From b54bbfb8b650614d1f56241df4cf2aa6ab53bfd3 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Fri, 3 Mar 2023 10:57:06 +0900
Subject: [PATCH 4/4] fix precommit

---
 .../xc_admin_frontend/components/tabs/General.tsx        | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
index ea3033fbe8..2f885c1ff7 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
@@ -464,8 +464,7 @@ const General = () => {
   }
 
   const MetadataChangesRows = ({ changes }: { changes: any }) => {
-    const addPriceFeed =
-      changes.prev === undefined && changes.new !== undefined
+    const addPriceFeed = changes.prev === undefined && changes.new !== undefined
 
     return (
       <>
@@ -498,8 +497,7 @@ const General = () => {
   }
 
   const PriceAccountsChangesRows = ({ changes }: { changes: any }) => {
-    const addPriceFeed =
-      changes.prev === undefined && changes.new !== undefined
+    const addPriceFeed = changes.prev === undefined && changes.new !== undefined
     return (
       <>
         {changes.new.map((priceAccount: any, index: number) =>
@@ -554,8 +552,7 @@ const General = () => {
   }
 
   const PublisherKeysChangesRows = ({ changes }: { changes: any }) => {
-    const addPriceFeed =
-      changes.prev === undefined && changes.new !== undefined
+    const addPriceFeed = changes.prev === undefined && changes.new !== undefined
     const publisherKeysToAdd = addPriceFeed
       ? changes.new
       : changes.new.filter(