From 639462455d655e0afe5dd3d553738880292f5161 Mon Sep 17 00:00:00 2001
From: Ashray Chowdhry <achowdhry@ripple.com>
Date: Wed, 29 Jan 2025 15:10:30 -0500
Subject: [PATCH] remove unnecessary conditionals

---
 .../Transaction/CredentialAccept/Simple.tsx   | 28 ++++--------
 .../CredentialAccept/TableDetail.tsx          | 33 +++++---------
 .../Transaction/CredentialCreate/Simple.tsx   | 26 ++++-------
 .../CredentialCreate/TableDetail.tsx          | 34 ++++++--------
 .../Transaction/CredentialDelete/Simple.tsx   | 33 +++++---------
 .../CredentialDelete/TableDetail.tsx          | 44 +++++++------------
 .../PermissionedDomainDelete/Simple.tsx       | 18 ++------
 .../PermissionedDomainDelete/TableDetail.tsx  | 18 +++-----
 .../PermissionedDomainSet/Simple.tsx          | 35 ++++++---------
 .../PermissionedDomainSet/TableDetail.tsx     | 29 +++++-------
 10 files changed, 104 insertions(+), 194 deletions(-)

diff --git a/src/containers/shared/components/Transaction/CredentialAccept/Simple.tsx b/src/containers/shared/components/Transaction/CredentialAccept/Simple.tsx
index a74b8a452..39cdb41a7 100644
--- a/src/containers/shared/components/Transaction/CredentialAccept/Simple.tsx
+++ b/src/containers/shared/components/Transaction/CredentialAccept/Simple.tsx
@@ -4,32 +4,22 @@ import { TransactionSimpleComponent, TransactionSimpleProps } from '../types'
 import { SimpleRow } from '../SimpleRow'
 import { convertHexToString } from '../../../../../rippled/lib/utils'
 
-const Simple: TransactionSimpleComponent = (
+export const Simple: TransactionSimpleComponent = (
   props: TransactionSimpleProps<CredentialAccept>,
 ) => {
   const { t } = useTranslation()
   const { data } = props
-  const { Account, Issuer, CredentialType } = data.instructions
+  const { Issuer, CredentialType } = data.instructions
 
   return (
     <>
-      {Account && (
-        <SimpleRow label={t('account')} data-test="account">
-          {Account}
-        </SimpleRow>
-      )}
-      {Issuer && (
-        <SimpleRow label={t('issuer')} data-test="issuer">
-          {Issuer}
-        </SimpleRow>
-      )}
-      {CredentialType && (
-        <SimpleRow label={t('credential_type')} data-test="credential-type">
-          {convertHexToString(CredentialType)}
-        </SimpleRow>
-      )}
+      <SimpleRow label={t('issuer')} data-test="issuer">
+        {Issuer}
+      </SimpleRow>
+
+      <SimpleRow label={t('credential_type')} data-test="credential-type">
+        {convertHexToString(CredentialType)}
+      </SimpleRow>
     </>
   )
 }
-
-export { Simple }
diff --git a/src/containers/shared/components/Transaction/CredentialAccept/TableDetail.tsx b/src/containers/shared/components/Transaction/CredentialAccept/TableDetail.tsx
index c3462a5b9..7611e57c4 100644
--- a/src/containers/shared/components/Transaction/CredentialAccept/TableDetail.tsx
+++ b/src/containers/shared/components/Transaction/CredentialAccept/TableDetail.tsx
@@ -7,29 +7,20 @@ export const TableDetail = ({
   instructions,
 }: TransactionTableDetailProps<CredentialAccept>) => {
   const { t } = useTranslation()
-  const { Account, Issuer, CredentialType } = instructions
+  const { Issuer, CredentialType } = instructions
   return (
     <div className="credentialAccept">
-      {Account && (
-        <div className="account">
-          <span className="label">{t('account')}: </span>
-          <span className="case-sensitive">{Account}</span>
-        </div>
-      )}
-      {Issuer && (
-        <div className="issuer">
-          <span className="label">{t('issuer')}: </span>
-          <span className="case-sensitive">{Issuer}</span>
-        </div>
-      )}
-      {CredentialType && (
-        <div className="credential-type">
-          <span className="label">{t('credential_type')}: </span>
-          <span className="case-sensitive">
-            {convertHexToString(CredentialType)}
-          </span>
-        </div>
-      )}
+      <div className="issuer">
+        <span className="label">{t('issuer')}: </span>
+        <span className="case-sensitive">{Issuer}</span>
+      </div>
+
+      <div className="credential-type">
+        <span className="label">{t('credential_type')}: </span>
+        <span className="case-sensitive">
+          {convertHexToString(CredentialType)}
+        </span>
+      </div>
     </div>
   )
 }
diff --git a/src/containers/shared/components/Transaction/CredentialCreate/Simple.tsx b/src/containers/shared/components/Transaction/CredentialCreate/Simple.tsx
index 45153c546..e02f7d7c7 100644
--- a/src/containers/shared/components/Transaction/CredentialCreate/Simple.tsx
+++ b/src/containers/shared/components/Transaction/CredentialCreate/Simple.tsx
@@ -9,26 +9,18 @@ const Simple: TransactionSimpleComponent = (
 ) => {
   const { t } = useTranslation()
   const { data } = props
-  const { Account, Subject, CredentialType, Expiration, URI } =
-    data.instructions
+  const { Subject, CredentialType, Expiration, URI } = data.instructions
 
   return (
     <>
-      {Account && (
-        <SimpleRow label={t('account')} data-test="account">
-          {Account}
-        </SimpleRow>
-      )}
-      {Subject && (
-        <SimpleRow label={t('subject')} data-test="subject">
-          {Subject}
-        </SimpleRow>
-      )}
-      {CredentialType && (
-        <SimpleRow label={t('credential_type')} data-test="credential-type">
-          {convertHexToString(CredentialType)}
-        </SimpleRow>
-      )}
+      <SimpleRow label={t('subject')} data-test="subject">
+        {Subject}
+      </SimpleRow>
+
+      <SimpleRow label={t('credential_type')} data-test="credential-type">
+        {convertHexToString(CredentialType)}
+      </SimpleRow>
+
       {Expiration && (
         <SimpleRow label={t('expiration')} data-test="expiration">
           {Expiration}
diff --git a/src/containers/shared/components/Transaction/CredentialCreate/TableDetail.tsx b/src/containers/shared/components/Transaction/CredentialCreate/TableDetail.tsx
index 2abceec3c..709de2e73 100644
--- a/src/containers/shared/components/Transaction/CredentialCreate/TableDetail.tsx
+++ b/src/containers/shared/components/Transaction/CredentialCreate/TableDetail.tsx
@@ -7,29 +7,21 @@ export const TableDetail = ({
   instructions,
 }: TransactionTableDetailProps<CredentialCreate>) => {
   const { t } = useTranslation()
-  const { Account, Subject, CredentialType, Expiration, URI } = instructions
+  const { Subject, CredentialType, Expiration, URI } = instructions
   return (
     <div className="credentialCreate">
-      {Account && (
-        <div className="account">
-          <span className="label">{t('account')}: </span>
-          <span className="case-sensitive">{Account}</span>
-        </div>
-      )}
-      {Subject && (
-        <div className="issuer">
-          <span className="label">{t('subject')}: </span>
-          <span className="case-sensitive">{Subject}</span>
-        </div>
-      )}
-      {CredentialType && (
-        <div className="credential-type">
-          <span className="label">{t('credential_type')}: </span>
-          <span className="case-sensitive">
-            {convertHexToString(CredentialType)}
-          </span>
-        </div>
-      )}
+      <div className="issuer">
+        <span className="label">{t('subject')}: </span>
+        <span className="case-sensitive">{Subject}</span>
+      </div>
+
+      <div className="credential-type">
+        <span className="label">{t('credential_type')}: </span>
+        <span className="case-sensitive">
+          {convertHexToString(CredentialType)}
+        </span>
+      </div>
+
       {Expiration && (
         <div className="expiration">
           <span className="label">{t('expiration')}: </span>
diff --git a/src/containers/shared/components/Transaction/CredentialDelete/Simple.tsx b/src/containers/shared/components/Transaction/CredentialDelete/Simple.tsx
index a6ec5560e..9563db7e2 100644
--- a/src/containers/shared/components/Transaction/CredentialDelete/Simple.tsx
+++ b/src/containers/shared/components/Transaction/CredentialDelete/Simple.tsx
@@ -9,30 +9,21 @@ const Simple: TransactionSimpleComponent = (
 ) => {
   const { t } = useTranslation()
   const { data } = props
-  const { Account, Subject, CredentialType, Issuer } = data.instructions
+  const { Subject, CredentialType, Issuer } = data.instructions
 
   return (
     <>
-      {Account && (
-        <SimpleRow label={t('account')} data-test="account">
-          {convertHexToString(Account)}
-        </SimpleRow>
-      )}
-      {Subject && (
-        <SimpleRow label={t('subject')} data-test="subject">
-          {convertHexToString(Subject)}
-        </SimpleRow>
-      )}
-      {Issuer && (
-        <SimpleRow label={t('issuer')} data-test="issuer">
-          {convertHexToString(Issuer)}
-        </SimpleRow>
-      )}
-      {CredentialType && (
-        <SimpleRow label={t('credential_type')} data-test="credential-type">
-          {convertHexToString(CredentialType)}
-        </SimpleRow>
-      )}
+      <SimpleRow label={t('subject')} data-test="subject">
+        {Subject}
+      </SimpleRow>
+
+      <SimpleRow label={t('issuer')} data-test="issuer">
+        {Issuer}
+      </SimpleRow>
+
+      <SimpleRow label={t('credential_type')} data-test="credential-type">
+        {convertHexToString(CredentialType)}
+      </SimpleRow>
     </>
   )
 }
diff --git a/src/containers/shared/components/Transaction/CredentialDelete/TableDetail.tsx b/src/containers/shared/components/Transaction/CredentialDelete/TableDetail.tsx
index 86dbf4f46..c40efd486 100644
--- a/src/containers/shared/components/Transaction/CredentialDelete/TableDetail.tsx
+++ b/src/containers/shared/components/Transaction/CredentialDelete/TableDetail.tsx
@@ -7,35 +7,25 @@ export const TableDetail = ({
   instructions,
 }: TransactionTableDetailProps<CredentialDelete>) => {
   const { t } = useTranslation()
-  const { Account, Subject, Issuer, CredentialType } = instructions
+  const { Subject, Issuer, CredentialType } = instructions
   return (
     <div className="credentialDelete">
-      {Account && (
-        <div className="account">
-          <span className="label">{t('account')}: </span>
-          <span className="case-sensitive">{Account}</span>
-        </div>
-      )}
-      {Subject && (
-        <div className="issuer">
-          <span className="label">{t('subject')}: </span>
-          <span className="case-sensitive">{Subject}</span>
-        </div>
-      )}
-      {Issuer && (
-        <div className="issuer">
-          <span className="label">{t('issuer')}: </span>
-          <span className="case-sensitive">{Issuer}</span>
-        </div>
-      )}
-      {CredentialType && (
-        <div className="credential-type">
-          <span className="label">{t('credential_type')}: </span>
-          <span className="case-sensitive">
-            {convertHexToString(CredentialType)}
-          </span>
-        </div>
-      )}
+      <div className="issuer">
+        <span className="label">{t('subject')}: </span>
+        <span className="case-sensitive">{Subject}</span>
+      </div>
+
+      <div className="issuer">
+        <span className="label">{t('issuer')}: </span>
+        <span className="case-sensitive">{Issuer}</span>
+      </div>
+
+      <div className="credential-type">
+        <span className="label">{t('credential_type')}: </span>
+        <span className="case-sensitive">
+          {convertHexToString(CredentialType)}
+        </span>
+      </div>
     </div>
   )
 }
diff --git a/src/containers/shared/components/Transaction/PermissionedDomainDelete/Simple.tsx b/src/containers/shared/components/Transaction/PermissionedDomainDelete/Simple.tsx
index 40147fbd2..8a7332f67 100644
--- a/src/containers/shared/components/Transaction/PermissionedDomainDelete/Simple.tsx
+++ b/src/containers/shared/components/Transaction/PermissionedDomainDelete/Simple.tsx
@@ -2,28 +2,18 @@ import { useTranslation } from 'react-i18next'
 import { type PermissionedDomainDelete } from 'xrpl'
 import { TransactionSimpleComponent, TransactionSimpleProps } from '../types'
 import { SimpleRow } from '../SimpleRow'
-import { convertHexToString } from '../../../../../rippled/lib/utils'
 
 const Simple: TransactionSimpleComponent = (
   props: TransactionSimpleProps<PermissionedDomainDelete>,
 ) => {
   const { t } = useTranslation()
   const { data } = props
-  const { Account, DomainID } = data.instructions
+  const { DomainID } = data.instructions
 
   return (
-    <>
-      {Account && (
-        <SimpleRow label={t('account')} data-test="account">
-          {Account}
-        </SimpleRow>
-      )}
-      {DomainID && (
-        <SimpleRow label={t('domain_id')} data-test="domain-id">
-          {DomainID}
-        </SimpleRow>
-      )}
-    </>
+    <SimpleRow label={t('domain_id')} data-test="domain-id">
+      {DomainID}
+    </SimpleRow>
   )
 }
 
diff --git a/src/containers/shared/components/Transaction/PermissionedDomainDelete/TableDetail.tsx b/src/containers/shared/components/Transaction/PermissionedDomainDelete/TableDetail.tsx
index d3e827f14..e2718686d 100644
--- a/src/containers/shared/components/Transaction/PermissionedDomainDelete/TableDetail.tsx
+++ b/src/containers/shared/components/Transaction/PermissionedDomainDelete/TableDetail.tsx
@@ -6,21 +6,13 @@ export const TableDetail = ({
   instructions,
 }: TransactionTableDetailProps<PermissionedDomainDelete>) => {
   const { t } = useTranslation()
-  const { Account, DomainID } = instructions
+  const { DomainID } = instructions
   return (
     <div className="permissionedDomainDelete">
-      {Account && (
-        <div className="account">
-          <span className="label">{t('account')}: </span>
-          <span className="case-sensitive">{Account}</span>
-        </div>
-      )}
-      {DomainID && (
-        <div className="domainId">
-          <span className="label">{t('domain_id')}: </span>
-          <span className="case-sensitive">{DomainID}</span>
-        </div>
-      )}
+      <div className="domainId">
+        <span className="label">{t('domain_id')}: </span>
+        <span className="case-sensitive">{DomainID}</span>
+      </div>
     </div>
   )
 }
diff --git a/src/containers/shared/components/Transaction/PermissionedDomainSet/Simple.tsx b/src/containers/shared/components/Transaction/PermissionedDomainSet/Simple.tsx
index c4fb0b7c2..1fe9138ec 100644
--- a/src/containers/shared/components/Transaction/PermissionedDomainSet/Simple.tsx
+++ b/src/containers/shared/components/Transaction/PermissionedDomainSet/Simple.tsx
@@ -2,37 +2,28 @@ import { useTranslation } from 'react-i18next'
 import { type PermissionedDomainSet } from 'xrpl'
 import { TransactionSimpleComponent, TransactionSimpleProps } from '../types'
 import { SimpleRow } from '../SimpleRow'
-import { convertHexToString } from '../../../../../rippled/lib/utils'
 
 const Simple: TransactionSimpleComponent = (
   props: TransactionSimpleProps<PermissionedDomainSet>,
 ) => {
   const { t } = useTranslation()
   const { data } = props
-  const { Account, DomainID, AcceptedCredentials } = data.instructions
+  const { DomainID, AcceptedCredentials } = data.instructions
 
   return (
     <>
-      {Account && (
-        <SimpleRow label={t('account')} data-test="account">
-          {Account}
-        </SimpleRow>
-      )}
-      {DomainID && (
-        <SimpleRow label={t('domain_id')} data-test="domain-id">
-          {DomainID}
-        </SimpleRow>
-      )}
-      {AcceptedCredentials && (
-        <SimpleRow
-          label={t('accepted_credentials')}
-          data-test="accepted-credentials"
-        >
-          {AcceptedCredentials.map((credential) => (
-            <div>{credential}</div>
-          ))}
-        </SimpleRow>
-      )}
+      <SimpleRow label={t('domain_id')} data-test="domain-id">
+        {DomainID}
+      </SimpleRow>
+
+      <SimpleRow
+        label={t('accepted_credentials')}
+        data-test="accepted-credentials"
+      >
+        {AcceptedCredentials.map((credential) => (
+          <div>{credential}</div>
+        ))}
+      </SimpleRow>
     </>
   )
 }
diff --git a/src/containers/shared/components/Transaction/PermissionedDomainSet/TableDetail.tsx b/src/containers/shared/components/Transaction/PermissionedDomainSet/TableDetail.tsx
index 746e5c1e1..b9f838087 100644
--- a/src/containers/shared/components/Transaction/PermissionedDomainSet/TableDetail.tsx
+++ b/src/containers/shared/components/Transaction/PermissionedDomainSet/TableDetail.tsx
@@ -6,27 +6,18 @@ export const TableDetail = ({
   instructions,
 }: TransactionTableDetailProps<PermissionedDomainSet>) => {
   const { t } = useTranslation()
-  const { Account, DomainID, AcceptedCredentials } = instructions
+  const { DomainID, AcceptedCredentials } = instructions
   return (
     <div className="permissionedDomainSet">
-      {Account && (
-        <div className="account">
-          <span className="label">{t('account')}: </span>
-          <span className="case-sensitive">{Account}</span>
-        </div>
-      )}
-      {DomainID && (
-        <div className="domainId">
-          <span className="label">{t('domain_id')}: </span>
-          <span className="case-sensitive">{DomainID}</span>
-        </div>
-      )}
-      {AcceptedCredentials && (
-        <div className="acceptedCredentials">
-          <span className="label">{t('accepted_credentials')}: </span>
-          <span className="case-sensitive">{AcceptedCredentials}</span>
-        </div>
-      )}
+      <div className="domainId">
+        <span className="label">{t('domain_id')}: </span>
+        <span className="case-sensitive">{DomainID}</span>
+      </div>
+
+      <div className="acceptedCredentials">
+        <span className="label">{t('accepted_credentials')}: </span>
+        <span className="case-sensitive">{AcceptedCredentials}</span>
+      </div>
     </div>
   )
 }