mirror of
https://github.com/freqtrade/frequi.git
synced 2024-11-25 12:35:15 +00:00
Remove deprecated trade_profit
This commit is contained in:
parent
8564908a9e
commit
eb128b89ce
|
@ -44,7 +44,7 @@ export default class HourlyChart extends Vue {
|
||||||
if (trade.close_timestamp) {
|
if (trade.close_timestamp) {
|
||||||
const hour = timestampHour(trade.close_timestamp);
|
const hour = timestampHour(trade.close_timestamp);
|
||||||
|
|
||||||
res[hour].profit += trade.close_profit;
|
res[hour].profit += trade.profit_ratio;
|
||||||
res[hour].count += 1;
|
res[hour].count += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,15 +14,11 @@
|
||||||
<span v-if="comb.locks" :title="comb.lockReason"> 🔒 </span>
|
<span v-if="comb.locks" :title="comb.lockReason"> 🔒 </span>
|
||||||
</div>
|
</div>
|
||||||
<b-badge
|
<b-badge
|
||||||
:variant="
|
:variant="comb.trade && comb.trade.profit_ratio > 0 ? 'success' : 'danger'"
|
||||||
comb.trade && comb.trade.current_profit && comb.trade.current_profit > 0
|
|
||||||
? 'success'
|
|
||||||
: 'danger'
|
|
||||||
"
|
|
||||||
pill
|
pill
|
||||||
:title="comb.profitString"
|
:title="comb.profitString"
|
||||||
>{{
|
>{{
|
||||||
comb.trade && comb.trade.current_profit ? formatPercent(comb.trade.current_profit) : ''
|
comb.trade && comb.trade.profit_ratio ? formatPercent(comb.trade.profit_ratio) : ''
|
||||||
}}</b-badge
|
}}</b-badge
|
||||||
>
|
>
|
||||||
</b-list-group-item>
|
</b-list-group-item>
|
||||||
|
@ -77,8 +73,8 @@ export default class PairSummary extends Vue {
|
||||||
lockReason = `${timestampms(locks.lock_end_timestamp)} - ${locks.reason}`;
|
lockReason = `${timestampms(locks.lock_end_timestamp)} - ${locks.reason}`;
|
||||||
}
|
}
|
||||||
let profitString = '';
|
let profitString = '';
|
||||||
if (trade && trade.current_profit) {
|
if (trade && trade.profit_ratio) {
|
||||||
profitString = `Current profit: ${formatPercent(trade.current_profit)}
|
profitString = `Current profit: ${formatPercent(trade.profit_ratio)}
|
||||||
Open since: ${timestampms(trade.open_timestamp)}`;
|
Open since: ${timestampms(trade.open_timestamp)}`;
|
||||||
}
|
}
|
||||||
comb.push({ pair, trade, locks, lockReason, profitString });
|
comb.push({ pair, trade, locks, lockReason, profitString });
|
||||||
|
|
|
@ -13,7 +13,7 @@ export default class ProfitSymbol extends Vue {
|
||||||
@Prop({ required: true }) trade!: Trade;
|
@Prop({ required: true }) trade!: Trade;
|
||||||
|
|
||||||
get isProfitable() {
|
get isProfitable() {
|
||||||
const res = (this.trade.close_profit ?? 0) > 0 || (this.trade.current_profit ?? 0) > 0;
|
const res = (this.trade.profit_ratio ?? 0) > 0;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,6 @@ export interface Trade {
|
||||||
close_date?: string;
|
close_date?: string;
|
||||||
close_timestamp?: number;
|
close_timestamp?: number;
|
||||||
close_rate?: number;
|
close_rate?: number;
|
||||||
close_profit?: number;
|
|
||||||
close_profit_abs?: number;
|
|
||||||
fee_close?: number;
|
fee_close?: number;
|
||||||
fee_close_cost?: number;
|
fee_close_cost?: number;
|
||||||
fee_close_currency?: string;
|
fee_close_currency?: string;
|
||||||
|
@ -29,12 +27,6 @@ export interface Trade {
|
||||||
profit_pct: number;
|
profit_pct: number;
|
||||||
/** Current absolute profit */
|
/** Current absolute profit */
|
||||||
profit_abs: number;
|
profit_abs: number;
|
||||||
/** Deprecated */
|
|
||||||
current_profit?: number;
|
|
||||||
/** Deprecated */
|
|
||||||
current_profit_abs?: number;
|
|
||||||
/** Deprecated */
|
|
||||||
current_profit_pct?: number;
|
|
||||||
|
|
||||||
sell_reason?: string;
|
sell_reason?: string;
|
||||||
min_rate?: number;
|
min_rate?: number;
|
||||||
|
@ -64,10 +56,7 @@ export interface ClosedTrade extends Trade {
|
||||||
close_date: string;
|
close_date: string;
|
||||||
close_timestamp: number;
|
close_timestamp: number;
|
||||||
close_rate: number;
|
close_rate: number;
|
||||||
/** Deprecated */
|
|
||||||
close_profit: number;
|
|
||||||
/** Deprecated */
|
|
||||||
close_profit_abs: number;
|
|
||||||
fee_close: number;
|
fee_close: number;
|
||||||
fee_close_cost?: number;
|
fee_close_cost?: number;
|
||||||
fee_close_currency?: string;
|
fee_close_currency?: string;
|
||||||
|
|
|
@ -11,8 +11,6 @@ describe('ProfitSymbol.vue', () => {
|
||||||
});
|
});
|
||||||
it('calculates isProfitable with negative profit', () => {
|
it('calculates isProfitable with negative profit', () => {
|
||||||
const trade = {
|
const trade = {
|
||||||
close_profit: -0.5,
|
|
||||||
current_profit: -0.5,
|
|
||||||
profit_ratio: -0.5,
|
profit_ratio: -0.5,
|
||||||
};
|
};
|
||||||
cmp.setProps({ trade });
|
cmp.setProps({ trade });
|
||||||
|
@ -32,8 +30,6 @@ describe('ProfitSymbol.vue', () => {
|
||||||
|
|
||||||
it('renders triangle down when profit is negative', async () => {
|
it('renders triangle down when profit is negative', async () => {
|
||||||
const trade = {
|
const trade = {
|
||||||
close_profit: -0.5,
|
|
||||||
current_profit: -0.5,
|
|
||||||
profit_ratio: -0.5,
|
profit_ratio: -0.5,
|
||||||
};
|
};
|
||||||
cmp.setProps({ trade });
|
cmp.setProps({ trade });
|
||||||
|
@ -44,8 +40,6 @@ describe('ProfitSymbol.vue', () => {
|
||||||
|
|
||||||
it('renders triangle up when profit is positive', async () => {
|
it('renders triangle up when profit is positive', async () => {
|
||||||
const trade = {
|
const trade = {
|
||||||
close_profit: 0.5,
|
|
||||||
current_profit: 0.5,
|
|
||||||
profit_ratio: 0.5,
|
profit_ratio: 0.5,
|
||||||
};
|
};
|
||||||
cmp.setProps({ trade });
|
cmp.setProps({ trade });
|
||||||
|
|
Loading…
Reference in New Issue
Block a user