Skip to content

Commit

Permalink
fix #1663
Browse files Browse the repository at this point in the history
  • Loading branch information
bassemmagdy committed Oct 13, 2021
1 parent 24ea698 commit 5d096c8
Showing 1 changed file with 28 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ import { MosaicModel } from '@/core/database/entities/MosaicModel';
// @ts-ignore
import MosaicSelector from '@/components/MosaicSelector/MosaicSelector.vue';
import { Formatters } from '@/core/utils/Formatters';
import { NetworkConfigurationModel } from '@/core/database/entities/NetworkConfigurationModel';
import { MosaicService } from '@/services/MosaicService';

@Component({
components: {
Expand All @@ -60,7 +62,14 @@ import { Formatters } from '@/core/utils/Formatters';
MaxFeeAndSubmit,
MosaicSelector,
},
computed: { ...mapGetters({ mosaics: 'mosaic/mosaics', holdMosaics: 'mosaic/holdMosaics' }) },
computed: {
...mapGetters({
mosaics: 'mosaic/mosaics',
holdMosaics: 'mosaic/holdMosaics',
currentHeight: 'network/currentHeight',
networkConfiguration: 'network/networkConfiguration',
}),
},
})
export class FormMosaicSupplyChangeTransactionTs extends FormTransactionBase {
/**
Expand Down Expand Up @@ -105,6 +114,16 @@ export class FormMosaicSupplyChangeTransactionTs extends FormTransactionBase {
*/
protected MosaicSupplyChangeAction = MosaicSupplyChangeAction;

/**
* Current network block height
*/
private currentHeight: number;
/**
* Network Configs
* @protected
*/
public networkConfiguration: NetworkConfigurationModel;

/**
* Form items
* @protected
Expand Down Expand Up @@ -248,6 +267,14 @@ export class FormMosaicSupplyChangeTransactionTs extends FormTransactionBase {
get ownedTargetHexIds(): string[] {
return this.holdMosaics
.filter((m) => m.ownerRawPlain === this.currentAccount.address && m.supplyMutable)
.filter((entry) => {
const expiration = MosaicService.getExpiration(
entry,
this.currentHeight,
this.networkConfiguration.blockGenerationTargetTime,
);
return expiration !== 'expired';
})
.map(({ mosaicIdHex }) => mosaicIdHex);
}

Expand Down

0 comments on commit 5d096c8

Please sign in to comment.