From f58501b4b9198faaf5df4b4d80df36e162dbfa95 Mon Sep 17 00:00:00 2001
From: Justin Starry <justin@solana.com>
Date: Sat, 25 Sep 2021 12:30:09 -0400
Subject: [PATCH] explorer: Make account owner program label clearer (#20214)

---
 .../src/components/account/UnknownAccountCard.tsx |  6 +++---
 explorer/src/components/common/Account.tsx        | 15 ---------------
 .../instruction/system/AllocateDetailsCard.tsx    |  4 ++--
 .../system/AllocateWithSeedDetailsCard.tsx        |  6 +++---
 .../instruction/system/AssignDetailsCard.tsx      |  2 +-
 .../system/AssignWithSeedDetailsCard.tsx          |  2 +-
 .../instruction/system/CreateDetailsCard.tsx      |  6 +++---
 .../system/CreateWithSeedDetailsCard.tsx          |  6 +++---
 8 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/explorer/src/components/account/UnknownAccountCard.tsx b/explorer/src/components/account/UnknownAccountCard.tsx
index bd6750a9cc..4055e955f2 100644
--- a/explorer/src/components/account/UnknownAccountCard.tsx
+++ b/explorer/src/components/account/UnknownAccountCard.tsx
@@ -42,14 +42,14 @@ export function UnknownAccountCard({ account }: { account: Account }) {
 
         {details?.space !== undefined && (
           <tr>
-            <td>Data (Bytes)</td>
-            <td className="text-lg-right">{details.space}</td>
+            <td>Allocated Data Size</td>
+            <td className="text-lg-right">{details.space} byte(s)</td>
           </tr>
         )}
 
         {details && (
           <tr>
-            <td>Owner</td>
+            <td>Assigned Program Id</td>
             <td className="text-lg-right">
               <Address pubkey={details.owner} alignRight link />
             </td>
diff --git a/explorer/src/components/common/Account.tsx b/explorer/src/components/common/Account.tsx
index 55e6c4a0ec..47f68fdd6f 100644
--- a/explorer/src/components/common/Account.tsx
+++ b/explorer/src/components/common/Account.tsx
@@ -46,18 +46,3 @@ export function AccountBalanceRow({ account }: AccountProps) {
     </tr>
   );
 }
-
-export function AccountOwnerRow({ account }: AccountProps) {
-  if (account.details) {
-    return (
-      <tr>
-        <td>Owner</td>
-        <td className="text-lg-right">
-          <Address pubkey={account.details.owner} alignRight link />
-        </td>
-      </tr>
-    );
-  }
-
-  return <></>;
-}
diff --git a/explorer/src/components/instruction/system/AllocateDetailsCard.tsx b/explorer/src/components/instruction/system/AllocateDetailsCard.tsx
index b40a636f48..377aec1baf 100644
--- a/explorer/src/components/instruction/system/AllocateDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/AllocateDetailsCard.tsx
@@ -42,8 +42,8 @@ export function AllocateDetailsCard(props: {
       </tr>
 
       <tr>
-        <td>Allocated Space (Bytes)</td>
-        <td className="text-lg-right">{info.space}</td>
+        <td>Allocated Data Size</td>
+        <td className="text-lg-right">{info.space} byte(s)</td>
       </tr>
     </InstructionCard>
   );
diff --git a/explorer/src/components/instruction/system/AllocateWithSeedDetailsCard.tsx b/explorer/src/components/instruction/system/AllocateWithSeedDetailsCard.tsx
index 6c3d94d34e..7d82671e37 100644
--- a/explorer/src/components/instruction/system/AllocateWithSeedDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/AllocateWithSeedDetailsCard.tsx
@@ -59,12 +59,12 @@ export function AllocateWithSeedDetailsCard(props: {
       </tr>
 
       <tr>
-        <td>Allocated Space (Bytes)</td>
-        <td className="text-lg-right">{info.space}</td>
+        <td>Allocated Data Size</td>
+        <td className="text-lg-right">{info.space} byte(s)</td>
       </tr>
 
       <tr>
-        <td>Assigned Owner</td>
+        <td>Assigned Program Id</td>
         <td className="text-lg-right">
           <Address pubkey={info.owner} alignRight link />
         </td>
diff --git a/explorer/src/components/instruction/system/AssignDetailsCard.tsx b/explorer/src/components/instruction/system/AssignDetailsCard.tsx
index 1353892eb1..92a73ce59a 100644
--- a/explorer/src/components/instruction/system/AssignDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/AssignDetailsCard.tsx
@@ -42,7 +42,7 @@ export function AssignDetailsCard(props: {
       </tr>
 
       <tr>
-        <td>Assigned Owner</td>
+        <td>Assigned Program Id</td>
         <td className="text-lg-right">
           <Address pubkey={info.owner} alignRight link />
         </td>
diff --git a/explorer/src/components/instruction/system/AssignWithSeedDetailsCard.tsx b/explorer/src/components/instruction/system/AssignWithSeedDetailsCard.tsx
index b4ea0c3530..1339c0b154 100644
--- a/explorer/src/components/instruction/system/AssignWithSeedDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/AssignWithSeedDetailsCard.tsx
@@ -59,7 +59,7 @@ export function AssignWithSeedDetailsCard(props: {
       </tr>
 
       <tr>
-        <td>Assigned Owner</td>
+        <td>Assigned Program Id</td>
         <td className="text-lg-right">
           <Address pubkey={info.owner} alignRight link />
         </td>
diff --git a/explorer/src/components/instruction/system/CreateDetailsCard.tsx b/explorer/src/components/instruction/system/CreateDetailsCard.tsx
index 3e6c2d6868..71d8459ad6 100644
--- a/explorer/src/components/instruction/system/CreateDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/CreateDetailsCard.tsx
@@ -57,12 +57,12 @@ export function CreateDetailsCard(props: {
       </tr>
 
       <tr>
-        <td>Allocated Space (Bytes)</td>
-        <td className="text-lg-right">{info.space}</td>
+        <td>Allocated Data Size</td>
+        <td className="text-lg-right">{info.space} byte(s)</td>
       </tr>
 
       <tr>
-        <td>Assigned Owner</td>
+        <td>Assigned Program Id</td>
         <td className="text-lg-right">
           <Address pubkey={info.owner} alignRight link />
         </td>
diff --git a/explorer/src/components/instruction/system/CreateWithSeedDetailsCard.tsx b/explorer/src/components/instruction/system/CreateWithSeedDetailsCard.tsx
index b2d0d7b3da..0ef9a6168b 100644
--- a/explorer/src/components/instruction/system/CreateWithSeedDetailsCard.tsx
+++ b/explorer/src/components/instruction/system/CreateWithSeedDetailsCard.tsx
@@ -74,12 +74,12 @@ export function CreateWithSeedDetailsCard(props: {
       </tr>
 
       <tr>
-        <td>Allocated Space (Bytes)</td>
-        <td className="text-lg-right">{info.space}</td>
+        <td>Allocated Data Size</td>
+        <td className="text-lg-right">{info.space} byte(s)</td>
       </tr>
 
       <tr>
-        <td>Assigned Owner</td>
+        <td>Assigned Program Id</td>
         <td className="text-lg-right">
           <Address pubkey={info.owner} alignRight link />
         </td>