diff --git a/frontend/src/app/universe/address-assets/address-assets.component.spec.ts b/frontend/src/app/universe/address-assets/address-assets.component.spec.ts index 55f50350e6b..29ed54c2e76 100644 --- a/frontend/src/app/universe/address-assets/address-assets.component.spec.ts +++ b/frontend/src/app/universe/address-assets/address-assets.component.spec.ts @@ -19,7 +19,7 @@ function position(protocolId: string, assetId: string, quantityAtomic?: string): outpoint: `${'a'.repeat(64)}:0`, vout: 0, valueSatsAtomic: '546', - asset: { protocolId, canonicalAssetId: assetId, assetKind: 'fungible', displayName: assetId }, + asset: { protocolId, assetId: assetId, assetKind: 'fungible', displayName: assetId }, quantityAtomic, state: 'unspent', evidence: { authorityId: 'ord', coverage: 'complete' }, diff --git a/frontend/src/app/universe/address-assets/address-assets.component.ts b/frontend/src/app/universe/address-assets/address-assets.component.ts index 7423e4a7895..3df9f82396b 100644 --- a/frontend/src/app/universe/address-assets/address-assets.component.ts +++ b/frontend/src/app/universe/address-assets/address-assets.component.ts @@ -168,11 +168,11 @@ function addPosition( ): void { const asset = position?.asset; if (!asset?.protocolId) {return;} - const assetKey = `${asset.protocolId}:${asset.canonicalAssetId ?? ''}`; + const assetKey = `${asset.protocolId}:${asset.assetId ?? ''}`; if (!holdings.has(assetKey)) { holdings.set(assetKey, { protocolId: asset.protocolId, - displayName: asset.displayName || asset.ticker || asset.canonicalAssetId || asset.protocolId, + displayName: asset.displayName || asset.ticker || asset.assetId || asset.protocolId, quantity: null, outpoints: [], }); diff --git a/frontend/src/app/universe/asset-flow/asset-flow.component.spec.ts b/frontend/src/app/universe/asset-flow/asset-flow.component.spec.ts index 1b0911d98ad..2f0bcc335f9 100644 --- a/frontend/src/app/universe/asset-flow/asset-flow.component.spec.ts +++ b/frontend/src/app/universe/asset-flow/asset-flow.component.spec.ts @@ -46,7 +46,7 @@ function position(overrides: Partial = {}): ExplorerOu outpoint: 'c'.repeat(64) + ':0', vout: 0, valueSatsAtomic: '10000', - asset: { protocolId: 'ordinals', canonicalAssetId: 'i0', assetKind: 'inscription' }, + asset: { protocolId: 'ordinals', assetId: 'i0', assetKind: 'inscription' }, state: 'active', evidence: evidence(), ...overrides, @@ -197,7 +197,7 @@ describe('AssetFlowComponent rare sats', () => { expect( subject.assetLabel({ protocolId: 'rare_sats', - canonicalAssetId: '1050000000000000', + assetId: '1050000000000000', displayName: 'epic', assetKind: 'sat', }), @@ -216,7 +216,7 @@ describe('AssetFlowComponent labels', () => { const inscriptionId = 'd'.repeat(64) + 'i0'; const shortened = subject.assetLabel({ protocolId: 'ordinals', - canonicalAssetId: inscriptionId, + assetId: inscriptionId, assetKind: 'inscription', }); expect(shortened).toContain('…'); @@ -224,7 +224,7 @@ describe('AssetFlowComponent labels', () => { expect( subject.assetLabel({ protocolId: 'runes', - canonicalAssetId: 'UNCOMMON.GOODS', + assetId: 'UNCOMMON.GOODS', ticker: 'UNCOMMON.GOODS', assetKind: 'fungible', }), @@ -243,7 +243,7 @@ describe('AssetFlowComponent labels', () => { it('accents an asset present on both sides of the transaction', () => { const subject = component(); - const asset = { protocolId: 'runes', canonicalAssetId: 'RUNE', assetKind: 'fungible' }; + const asset = { protocolId: 'runes', assetId: 'RUNE', assetKind: 'fungible' }; const transferred = flow({ actions: [ { diff --git a/frontend/src/app/universe/asset-flow/asset-flow.component.ts b/frontend/src/app/universe/asset-flow/asset-flow.component.ts index 1731f490a5b..ad44c2cfc40 100644 --- a/frontend/src/app/universe/asset-flow/asset-flow.component.ts +++ b/frontend/src/app/universe/asset-flow/asset-flow.component.ts @@ -249,7 +249,7 @@ export class AssetFlowComponent implements OnChanges { if (asset.ticker) { return asset.ticker; } - const id = asset.canonicalAssetId ?? ''; + const id = asset.assetId ?? ''; if (asset.assetKind === 'inscription' && id.length > 20) { return id.slice(0, 8) + '…' + id.slice(-3); } @@ -281,7 +281,7 @@ export class AssetFlowComponent implements OnChanges { return (flow.actions ?? []).some( (action) => action.actionType === 'transfer' && - action.asset?.canonicalAssetId === position.asset?.canonicalAssetId, + action.asset?.assetId === position.asset?.assetId, ); } @@ -315,7 +315,7 @@ export class AssetFlowComponent implements OnChanges { } trackPosition(index: number, position: ExplorerOutpointPosition): string { - return position.outpoint + ':' + (position.asset?.canonicalAssetId ?? index); + return position.outpoint + ':' + (position.asset?.assetId ?? index); } trackAction(index: number, action: ExplorerAssetAction): string { diff --git a/frontend/src/app/universe/outpoint/outpoint.component.html b/frontend/src/app/universe/outpoint/outpoint.component.html index 19d33dfb960..8ac9dbe2c19 100644 --- a/frontend/src/app/universe/outpoint/outpoint.component.html +++ b/frontend/src/app/universe/outpoint/outpoint.component.html @@ -84,7 +84,7 @@