Skip to content

Commit 45f6034

Browse files
authored
Merge pull request #989 from oasisprotocol/csillag/display-unencrypted-format-for-tx-details
Display TX format for unencrypted transactions
2 parents e08e51d + 7580b1f commit 45f6034

3 files changed

Lines changed: 16 additions & 6 deletions

File tree

.changelog/898.trivial.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Display TX format for unencrypted transactions

src/app/pages/TransactionDetailPage/index.tsx

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { CurrentFiatValue } from './CurrentFiatValue'
3232
import { AddressSwitch, AddressSwitchOption } from '../../components/AddressSwitch'
3333
import InfoIcon from '@mui/icons-material/Info'
3434
import Tooltip from '@mui/material/Tooltip'
35-
import { TransactionEncrypted } from '../../components/TransactionEncryptionStatus'
35+
import { TransactionEncrypted, TransactionNotEncrypted } from '../../components/TransactionEncryptionStatus'
3636
import Typography from '@mui/material/Typography'
3737
import { LongDataDisplay } from '../../components/LongDataDisplay'
3838
import { getPreciseNumberFormat } from '../../../locales/getPreciseNumberFormat'
@@ -245,6 +245,19 @@ export const TransactionDetailView: FC<{
245245
<RuntimeTransactionLabel method={transaction.method} />
246246
</dd>
247247

248+
<dt>{t('transactions.encryption.format')}</dt>
249+
<dd>
250+
{transaction.encryption_envelope ? (
251+
<>
252+
{transaction.encryption_envelope.format} &nbsp; <TransactionEncrypted />
253+
</>
254+
) : (
255+
<>
256+
{t('transactions.encryption.plain')} &nbsp; <TransactionNotEncrypted />
257+
</>
258+
)}
259+
</dd>
260+
248261
<dt>{t('common.timestamp')}</dt>
249262
<dd>{formattedTimestamp}</dd>
250263

@@ -347,11 +360,6 @@ export const TransactionDetailView: FC<{
347360

348361
{transaction.encryption_envelope && (
349362
<>
350-
<dt>{t('transactions.encryption.format')}</dt>
351-
<dd>
352-
{transaction.encryption_envelope.format} &nbsp; <TransactionEncrypted />
353-
</dd>
354-
355363
{transaction.encryption_envelope.public_key !== undefined && (
356364
<>
357365
<dt>{t('transactions.encryption.publicKey')}</dt>

src/locales/en/translation.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@
243243
"encryptedData": "Data (encrypted)",
244244
"encryptedResult": "Result (encrypted)",
245245
"format": "Format",
246+
"plain": "Plain",
246247
"publicKey": "Public Key",
247248
"resultNonce": "Result Nonce"
248249
},

0 commit comments

Comments
 (0)