forked from binary-com/deriv-app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Maryia/positions-redesign/Contract cards improvements + fetching Open…
… positions + formatProfitTableTransactions TS migration (#58) * refactor: contract-card-list and card * feat: buttons demo + animation improvements * feat: finilize Duration component for the card * chore: ts migration for closed positions * fix: console error with remaining time & showing empty message only when empty * feat: connect real open postions + style and filter fixes
- Loading branch information
1 parent
1437e77
commit 6c5106b
Showing
14 changed files
with
287 additions
and
450 deletions.
There are no files selected for viewing
27 changes: 0 additions & 27 deletions
27
packages/reports/src/Stores/Modules/Profit/Helpers/format-response.js
This file was deleted.
Oops, something went wrong.
35 changes: 35 additions & 0 deletions
35
packages/reports/src/Stores/Modules/Profit/Helpers/format-response.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
import { formatMoney, toMoment, getSymbolDisplayName, getMarketInformation } from '@deriv/shared'; | ||
import { ActiveSymbols, ProfitTable } from '@deriv/api-types'; | ||
|
||
export const formatProfitTableTransactions = ( | ||
transaction: NonNullable<ProfitTable['transactions']>[number], | ||
currency: string, | ||
active_symbols: ActiveSymbols = [] | ||
) => { | ||
const format_string = 'DD MMM YYYY HH:mm:ss'; | ||
const purchase_time = `${toMoment(Number(transaction.purchase_time)).format(format_string)}`; | ||
const purchase_time_unix = transaction.purchase_time; | ||
const sell_time = `${toMoment(Number(transaction.sell_time)).format(format_string)}`; | ||
const payout = transaction.payout ?? NaN; | ||
const sell_price = transaction.sell_price ?? NaN; | ||
const buy_price = transaction.buy_price ?? NaN; | ||
const profit_loss = formatMoney(currency, Number(sell_price - buy_price), true); | ||
const display_name = getSymbolDisplayName( | ||
active_symbols, | ||
getMarketInformation(transaction.shortcode ?? '').underlying | ||
); | ||
|
||
return { | ||
...transaction, | ||
...{ | ||
payout, | ||
sell_price, | ||
buy_price, | ||
profit_loss, | ||
sell_time, | ||
purchase_time, | ||
display_name, | ||
purchase_time_unix, | ||
}, | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 33 additions & 42 deletions
75
packages/trader/src/AppV2/Components/ContractCard/contract-card-list.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.