Merge pull request #365 from blockworks-foundation/lou/activity-feed-fees
give loan fees a clearer name in the activity feed
This commit is contained in:
commit
fca4ca7f47
|
@ -73,7 +73,7 @@ export const getFee = (activity: any, mangoAccountAddress: string) => {
|
|||
const { borrow_fee, symbol } = activity.activity_details
|
||||
fee = { value: formatFee(borrow_fee), symbol }
|
||||
}
|
||||
if (activity_type == 'settle_funds') {
|
||||
if (activity_type == 'loan_origination_fee') {
|
||||
const { fee: settleFee, symbol } = activity.activity_details
|
||||
fee = { value: formatFee(settleFee), symbol }
|
||||
}
|
||||
|
@ -278,7 +278,7 @@ export const getValue = (activity: any, mangoAccountAddress: string) => {
|
|||
const { price, size } = activity.activity_details
|
||||
value = price * size
|
||||
}
|
||||
if (activity_type === 'settle_funds') {
|
||||
if (activity_type === 'loan_origination_fee') {
|
||||
const { price, fee } = activity.activity_details
|
||||
value = price * fee
|
||||
}
|
||||
|
|
|
@ -46,7 +46,7 @@ const DEFAULT_PARAMS = [
|
|||
'openbook_trade',
|
||||
'swap',
|
||||
'withdraw',
|
||||
'settle_funds',
|
||||
'loan_origination_fee',
|
||||
]
|
||||
|
||||
const ActivityFilters = () => {
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"liquidations": "Liquidations",
|
||||
"liquidation-details": "Liquidation Details",
|
||||
"liquidator": "Liquidator",
|
||||
"loan_origination_fee": "Loan Origination Fee",
|
||||
"net-price": "Net Price",
|
||||
"net-price-desc": "The trade price inclusive of fees",
|
||||
"no-activity": "No account activity",
|
||||
|
@ -33,7 +34,6 @@
|
|||
"perp_trade": "Perp Trade",
|
||||
"reset-filters": "Reset Filters",
|
||||
"select-tokens": "Select Tokens",
|
||||
"settle_funds": "Settle Funds",
|
||||
"spot-trade": "Spot Trade",
|
||||
"swap": "Swap",
|
||||
"swaps": "Swaps",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"liquidations": "Liquidations",
|
||||
"liquidation-details": "Liquidation Details",
|
||||
"liquidator": "Liquidator",
|
||||
"loan_origination_fee":" Loan Origination Fee",
|
||||
"net-price": "Net Price",
|
||||
"net-price-desc": "The trade price inclusive of fees",
|
||||
"no-activity": "No account activity",
|
||||
|
@ -32,7 +33,6 @@
|
|||
"perps": "Perps",
|
||||
"perp_trade": "Perp Trade",
|
||||
"reset-filters": "Reset Filters",
|
||||
"settle_funds": "Settle Funds",
|
||||
"select-tokens": "Select Tokens",
|
||||
"spot-trade": "Spot Trade",
|
||||
"swap": "Swap",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"liquidations": "Liquidations",
|
||||
"liquidation-details": "Liquidation Details",
|
||||
"liquidator": "Liquidator",
|
||||
"loan_origination_fee":" Loan Origination Fee",
|
||||
"net-price": "Net Price",
|
||||
"net-price-desc": "The trade price inclusive of fees",
|
||||
"no-activity": "No account activity",
|
||||
|
@ -33,7 +34,6 @@
|
|||
"perp_trade": "Perp Trade",
|
||||
"reset-filters": "Reset Filters",
|
||||
"select-tokens": "Select Tokens",
|
||||
"settle_funds": "Settle Funds",
|
||||
"spot-trade": "Spot Trade",
|
||||
"swap": "Swap",
|
||||
"swaps": "Swaps",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"liquidation-type": "清算类别",
|
||||
"liquidations": "清算",
|
||||
"liquidator": "清算者",
|
||||
"loan_origination_fee": "Loan Origination Fee",
|
||||
"net-price": "净价",
|
||||
"net-price-desc": "包含费用的交易价格",
|
||||
"no-activity": "无帐户历史",
|
||||
|
@ -33,7 +34,6 @@
|
|||
"perps": "永续合约",
|
||||
"reset-filters": "重置筛选",
|
||||
"select-tokens": "选择币种",
|
||||
"settle_funds": "结清资金",
|
||||
"spot-trade": "现货交易",
|
||||
"swap": "换币",
|
||||
"swaps": "换币",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"liquidation-type": "清算類別",
|
||||
"liquidations": "清算",
|
||||
"liquidator": "清算者",
|
||||
"loan_origination_fee": "Loan Origination Fee",
|
||||
"net-price": "淨價",
|
||||
"net-price-desc": "包含費用的交易價格",
|
||||
"no-activity": "無帳戶歷史",
|
||||
|
@ -32,7 +33,6 @@
|
|||
"perp_trade": "合約交易",
|
||||
"perps": "永續合約",
|
||||
"reset-filters": "重置篩選",
|
||||
"settle_funds": "結清資金",
|
||||
"select-tokens": "選擇幣種",
|
||||
"spot-trade": "現貨交易",
|
||||
"swap": "換幣",
|
||||
|
|
Loading…
Reference in New Issue