diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index ab59f1299..a4a994237 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "1957.33300264550275", + "locked_amount": "1940.18588471713475", "deposits": [ { "amount": "2500", @@ -417,7 +417,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "78164.266998948196171665", + "locked_amount": "77868.136273576889945145", "deposits": [ { "amount": "129999.45", @@ -483,7 +483,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "52600", "total_removed": "0", - "locked_amount": "34081.03046676813842", + "locked_amount": "33901.13699898528422", "deposits": [ { "amount": "2600", @@ -656,7 +656,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "3431.422501268392", + "locked_amount": "3414.3223617453065", "deposits": [ { "amount": "5000", @@ -867,7 +867,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "19894.0662180522409542024", + "locked_amount": "19603.5895622878544995566", "deposits": [ { "amount": "97499.58", @@ -900,7 +900,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "27191.753952827012082868500372", + "locked_amount": "26794.722513099623877331529976", "deposits": [ { "amount": "135173.4239508", @@ -946,7 +946,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "8369.090105787037879626", + "locked_amount": "8246.891592970493102298", "deposits": [ { "amount": "32499.86", @@ -979,7 +979,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "2724.057617705609748004", + "locked_amount": "2684.2831875701254250357", "deposits": [ { "amount": "10833.29", @@ -1012,7 +1012,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "0", - "locked_amount": "10183.135782264397751799", + "locked_amount": "10034.4500789594237815401", "deposits": [ { "amount": "6500", @@ -1151,7 +1151,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "2874.8038482", - "locked_amount": "13859.7318139963185", + "locked_amount": "13704.5551335174945", "deposits": [ { "amount": "7500", @@ -1283,7 +1283,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "762651.44548115933607717", + "locked_amount": "756016.836288601078739548", "deposits": [ { "amount": "1852091.69", @@ -1635,7 +1635,7 @@ "tranche_end": "2023-02-01T00:00:00.000Z", "total_added": "42500", "total_removed": "24434.0787288", - "locked_amount": "5195.5886423107881", + "locked_amount": "4907.2561267109497", "deposits": [ { "amount": "12500", @@ -32618,7 +32618,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "433100.0722424088769", - "locked_amount": "1196431.06940241446357793816", + "locked_amount": "1186235.98499903432681818163", "deposits": [ { "amount": "1998.95815", @@ -33865,8 +33865,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", - "total_removed": "526510.17985046188946952", - "locked_amount": "9542155.3395249596557179118946052261178697", + "total_removed": "527100.47537846733234452", + "locked_amount": "9506004.2248175546335320324549673678237361", "deposits": [ { "amount": "16249.93", @@ -34450,6 +34450,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0x759e2a2fd1eef4e42379fa4efd2d9ee9ec6e540466f3c806c6cbcc4f4d312d8a" }, + { + "amount": "590.295528005442875", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0x80ea83d610976b6cc72f5800478fcc1c7461b591cf5478f56f0c8ecddcbcb23d" + }, { "amount": "1269.616788", "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", @@ -35862,6 +35867,12 @@ "tranche_id": 2, "tx": "0x759e2a2fd1eef4e42379fa4efd2d9ee9ec6e540466f3c806c6cbcc4f4d312d8a" }, + { + "amount": "590.295528005442875", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0x80ea83d610976b6cc72f5800478fcc1c7461b591cf5478f56f0c8ecddcbcb23d" + }, { "amount": "946.199315941372625", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -36806,8 +36817,8 @@ } ], "total_tokens": "259998.8875", - "withdrawn_tokens": "103609.775221214843625", - "remaining_tokens": "156389.112278785156375" + "withdrawn_tokens": "104200.0707492202865", + "remaining_tokens": "155798.8167507797135" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -38870,8 +38881,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "3599231.82781676343440649", - "locked_amount": "3087811.655922037292351883393617247", + "total_removed": "3609272.68548682983670307", + "locked_amount": "3054437.17765120880888423665554315", "deposits": [ { "amount": "129284.449", @@ -39145,6 +39156,16 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xb2ab581d3bf01f499b126296353908682a9a9687c4ffd1721c709438d7fbded9" }, + { + "amount": "9222.34263940955166558", + "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", + "tx": "0xb95559e1b1e4ffcb7def9c80c31d53d2eef4d15f1c694696bf4382b611418898" + }, + { + "amount": "818.515030656850631", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0xeb0bc39b68128ac643f37bff442c5f659cd1e88281e12f4c717415dbbc3de7eb" + }, { "amount": "1289.16117292541627425", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -41820,6 +41841,12 @@ "tranche_id": 3, "tx": "0xb2ab581d3bf01f499b126296353908682a9a9687c4ffd1721c709438d7fbded9" }, + { + "amount": "818.515030656850631", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0xeb0bc39b68128ac643f37bff442c5f659cd1e88281e12f4c717415dbbc3de7eb" + }, { "amount": "1289.16117292541627425", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -44060,8 +44087,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "283075.2852995408149445", - "remaining_tokens": "76048.1842754591850555" + "withdrawn_tokens": "283893.8003301976655755", + "remaining_tokens": "75229.6692448023344245" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -44290,6 +44317,12 @@ "tranche_id": 3, "tx": "0x102a1ef7c06d7481b25532917f32eaa76a292e56937c77095c18de84f490ed46" }, + { + "amount": "9222.34263940955166558", + "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", + "tranche_id": 3, + "tx": "0xb95559e1b1e4ffcb7def9c80c31d53d2eef4d15f1c694696bf4382b611418898" + }, { "amount": "9158.56255453299474378", "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8", @@ -44580,8 +44613,8 @@ } ], "total_tokens": "1266324.603486", - "withdrawn_tokens": "991480.72706996994645786", - "remaining_tokens": "274843.87641603005354214" + "withdrawn_tokens": "1000703.06970937949812344", + "remaining_tokens": "265621.53377662050187656" }, { "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296", @@ -45328,8 +45361,8 @@ "tranche_start": "2021-10-05T00:00:00.000Z", "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", - "total_removed": "2575594.579190537900922668", - "locked_amount": "903109.656644030560668555151568422", + "total_removed": "2597628.925248485688637789", + "locked_amount": "889923.198432061848505214307367836", "deposits": [ { "amount": "552496.6455", @@ -45488,6 +45521,16 @@ "user": "0x83b1a48376E045D26420200345414e6b93066396", "tx": "0x1b4cb95be25d86f9a77b86aa491d43bb10c5ea63aa02e70d922525e73eca76da" }, + { + "amount": "18362.008706688844354071", + "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d", + "tx": "0xf78382b7329d11ec2205c3e0cf55bc7ffcd4e60d832909ca8ae399965e696473" + }, + { + "amount": "3672.33735125894336105", + "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D", + "tx": "0x82be5a49bd941e6bd0551b7bad8e28d0143ad9865993254373be44cfcc863fb2" + }, { "amount": "4206.439644984274503", "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", @@ -46450,6 +46493,12 @@ } ], "withdrawals": [ + { + "amount": "3672.33735125894336105", + "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D", + "tranche_id": 4, + "tx": "0x82be5a49bd941e6bd0551b7bad8e28d0143ad9865993254373be44cfcc863fb2" + }, { "amount": "5209.0810147518216128", "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D", @@ -46524,8 +46573,8 @@ } ], "total_tokens": "92082.572555", - "withdrawn_tokens": "74207.92733738477528665", - "remaining_tokens": "17874.64521761522471335" + "withdrawn_tokens": "77880.2646886437186477", + "remaining_tokens": "14202.3078663562813523" }, { "address": "0x1dC9B91DE003fd503F25cB5d114cf0fc68F7aFe6", @@ -46553,6 +46602,12 @@ } ], "withdrawals": [ + { + "amount": "18362.008706688844354071", + "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d", + "tranche_id": 4, + "tx": "0xf78382b7329d11ec2205c3e0cf55bc7ffcd4e60d832909ca8ae399965e696473" + }, { "amount": "26183.360025951715511861", "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d", @@ -46645,8 +46700,8 @@ } ], "total_tokens": "460415.072915097", - "withdrawn_tokens": "371040.482572867066845612", - "remaining_tokens": "89374.590342229933154388" + "withdrawn_tokens": "389402.491279555911199683", + "remaining_tokens": "71012.581635541088800317" }, { "address": "0xd66e4853c0880df150e7329974715BFC8d2da47D", @@ -47157,8 +47212,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "28199.3663956479005", - "locked_amount": "189581.342038373757841323838254696", + "total_removed": "28669.8925879319005", + "locked_amount": "187965.87263707111420601980010148", "deposits": [ { "amount": "3000", @@ -53817,6 +53872,26 @@ "user": "0xe2311b0A4614BE4E839213aBbF8989127acAd455", "tx": "0x5d3385c8f00aa9fe5dcff68c7438a1522859277bd0fee6cab15eb06ae2283223" }, + { + "amount": "239.520230844", + "user": "0xCf46221128d84361Ed881EaDC66752977805c456", + "tx": "0xa9764d8999f1bd1c045416acef2049a6743b41651c828b971a14ff89342f43dc" + }, + { + "amount": "84.425145866", + "user": "0x046717d8914087EB6890dFdF78ebD0f1343F15F6", + "tx": "0xce92a4bcb3129aee070871a5b93841530942702b91040887ac18ba3188814d63" + }, + { + "amount": "120.24984145", + "user": "0x3F9E884B459a6AaC3f66b72555611AdE68a7F472", + "tx": "0x16e05bed5933bae2ca8575b77f5305c198dee91fdbd6cad7bf23ca37bea0f4c5" + }, + { + "amount": "26.330974124", + "user": "0x8c951C54F9cd08Cf81F770248e835D7A4F491a46", + "tx": "0xe5b554c0e13dd3f178e5ec3fa7f42fc83d478acc804c6f39c52a61c005083522" + }, { "amount": "20.707914768", "user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A", @@ -65051,10 +65126,17 @@ "tx": "0xadc25e73736cd85e84fee16f2d7ee41f16f7deb83a52ceb82b327974063964f7" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "239.520230844", + "user": "0xCf46221128d84361Ed881EaDC66752977805c456", + "tranche_id": 5, + "tx": "0xa9764d8999f1bd1c045416acef2049a6743b41651c828b971a14ff89342f43dc" + } + ], "total_tokens": "400", - "withdrawn_tokens": "0", - "remaining_tokens": "400" + "withdrawn_tokens": "239.520230844", + "remaining_tokens": "160.479769156" }, { "address": "0x8CcC22a2258A9469c1816Fd959c077079826B7ab", @@ -68289,6 +68371,12 @@ } ], "withdrawals": [ + { + "amount": "84.425145866", + "user": "0x046717d8914087EB6890dFdF78ebD0f1343F15F6", + "tranche_id": 5, + "tx": "0xce92a4bcb3129aee070871a5b93841530942702b91040887ac18ba3188814d63" + }, { "amount": "35.817998476", "user": "0x046717d8914087EB6890dFdF78ebD0f1343F15F6", @@ -68297,8 +68385,8 @@ } ], "total_tokens": "200", - "withdrawn_tokens": "35.817998476", - "remaining_tokens": "164.182001524" + "withdrawn_tokens": "120.243144342", + "remaining_tokens": "79.756855658" }, { "address": "0x8847EBaaf29A18396e49191602f8d8D141b98aa7", @@ -72972,10 +73060,17 @@ "tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "120.24984145", + "user": "0x3F9E884B459a6AaC3f66b72555611AdE68a7F472", + "tranche_id": 5, + "tx": "0x16e05bed5933bae2ca8575b77f5305c198dee91fdbd6cad7bf23ca37bea0f4c5" + } + ], "total_tokens": "200", - "withdrawn_tokens": "0", - "remaining_tokens": "200" + "withdrawn_tokens": "120.24984145", + "remaining_tokens": "79.75015855" }, { "address": "0x8c951C54F9cd08Cf81F770248e835D7A4F491a46", @@ -72988,6 +73083,12 @@ } ], "withdrawals": [ + { + "amount": "26.330974124", + "user": "0x8c951C54F9cd08Cf81F770248e835D7A4F491a46", + "tranche_id": 5, + "tx": "0xe5b554c0e13dd3f178e5ec3fa7f42fc83d478acc804c6f39c52a61c005083522" + }, { "amount": "68.976560122", "user": "0x8c951C54F9cd08Cf81F770248e835D7A4F491a46", @@ -73002,8 +73103,8 @@ } ], "total_tokens": "200", - "withdrawn_tokens": "93.920998224", - "remaining_tokens": "106.079001776" + "withdrawn_tokens": "120.251972348", + "remaining_tokens": "79.748027652" }, { "address": "0x3437f6ED844013852650851D769ae7939B5e0aec", @@ -75327,7 +75428,7 @@ "tranche_start": "2021-12-05T00:00:00.000Z", "tranche_end": "2022-06-05T00:00:00.000Z", "total_added": "171288.42", - "total_removed": "60949.0699829322989", + "total_removed": "61445.7249006422989", "locked_amount": "0", "deposits": [ { @@ -79562,6 +79663,16 @@ "user": "0x51Cf9D02B5367CF9314D82Ec82A4208e0F874Ecc", "tx": "0x0cc9d8952ce14aa86658b410f14fee629d32ee3edb38c2c3829470d2faaee253" }, + { + "amount": "246.65491771", + "user": "0x49966Ce3d059F89D1E92389E53a618A13B491e5a", + "tx": "0x1d471b0826119ca5384d130bb6c7f09d4cd591d1f72effb1ef02898844f9be15" + }, + { + "amount": "250", + "user": "0x2394462d77c51A174D912E229d426917051af04F", + "tx": "0x8e053b46505955d72ef773d0ba72f500092fb0de2aaacdcf1c90121c2534fb67" + }, { "amount": "100", "user": "0xcAa37d61240A9627BD0Ac503CB5fA55bab8e3dF2", @@ -82430,10 +82541,17 @@ "tx": "0xee02e72ef8e0755982704385da512cc12c8ff0ea7b58056fa3d5a5932394e9ca" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "250", + "user": "0x2394462d77c51A174D912E229d426917051af04F", + "tranche_id": 6, + "tx": "0x8e053b46505955d72ef773d0ba72f500092fb0de2aaacdcf1c90121c2534fb67" + } + ], "total_tokens": "250", - "withdrawn_tokens": "0", - "remaining_tokens": "250" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0xB57B13b4Fe511C27EA5a658E938bFF7dd43F6c53", @@ -95381,6 +95499,12 @@ } ], "withdrawals": [ + { + "amount": "246.65491771", + "user": "0x49966Ce3d059F89D1E92389E53a618A13B491e5a", + "tranche_id": 6, + "tx": "0x1d471b0826119ca5384d130bb6c7f09d4cd591d1f72effb1ef02898844f9be15" + }, { "amount": "3.34508229", "user": "0x49966Ce3d059F89D1E92389E53a618A13B491e5a", @@ -95389,8 +95513,8 @@ } ], "total_tokens": "250", - "withdrawn_tokens": "3.34508229", - "remaining_tokens": "246.65491771" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0xC745C8679ecaafDc9936B3f623e0D77A9403Fd68", diff --git a/apps/trading-e2e/src/integration/trading-orders.cy.ts b/apps/trading-e2e/src/integration/trading-orders.cy.ts index 164fbf786..b3ee0cc78 100644 --- a/apps/trading-e2e/src/integration/trading-orders.cy.ts +++ b/apps/trading-e2e/src/integration/trading-orders.cy.ts @@ -216,12 +216,14 @@ describe('subscribe orders', { tags: '@smoke' }, () => { it('must see a parked order', () => { // 7002-SORD-048 - // NOT COVERED: must see an explanation of why parked orders happen updateOrder({ id: orderId, status: Schema.OrderStatus.STATUS_PARKED, }); - cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Parked'); + cy.getByTestId(`order-status-${orderId}`).should( + 'have.text', + 'Parked: Internal error' + ); }); it('must see the size of the order and direction/side -', () => { diff --git a/apps/trading/client-pages/market/trade-grid.tsx b/apps/trading/client-pages/market/trade-grid.tsx index c1bf7ea8d..86adb87db 100644 --- a/apps/trading/client-pages/market/trade-grid.tsx +++ b/apps/trading/client-pages/market/trade-grid.tsx @@ -83,7 +83,7 @@ const MainGrid = ({ > - + diff --git a/libs/market-depth/src/lib/orderbook.tsx b/libs/market-depth/src/lib/orderbook.tsx index 93c086c28..96363c005 100644 --- a/libs/market-depth/src/lib/orderbook.tsx +++ b/libs/market-depth/src/lib/orderbook.tsx @@ -13,7 +13,7 @@ import { import classNames from 'classnames'; import { - addDecimalsFormatNumber, + addDecimalsFixedFormatNumber, t, useResizeObserver, formatNumberFixed, @@ -227,25 +227,25 @@ const OrderbookDebugInfo = ({ viewportHeight, lockOnMidPrice, priceInCenter: priceInCenter - ? addDecimalsFormatNumber(priceInCenter, decimalPlaces) + ? addDecimalsFixedFormatNumber(priceInCenter, decimalPlaces) : '-', - maxPriceLevel: addDecimalsFormatNumber( + maxPriceLevel: addDecimalsFixedFormatNumber( maxPriceLevel ?? '0', decimalPlaces ), - bestStaticBidPrice: addDecimalsFormatNumber( + bestStaticBidPrice: addDecimalsFixedFormatNumber( bestStaticBidPrice ?? '0', decimalPlaces ), - bestStaticOfferPrice: addDecimalsFormatNumber( + bestStaticOfferPrice: addDecimalsFixedFormatNumber( bestStaticOfferPrice ?? '0', decimalPlaces ), - minPriceLevel: addDecimalsFormatNumber( + minPriceLevel: addDecimalsFixedFormatNumber( minPriceLevel ?? '0', decimalPlaces ), - midPrice: addDecimalsFormatNumber( + midPrice: addDecimalsFixedFormatNumber( (bestStaticOfferPrice && bestStaticBidPrice && getPriceLevel( diff --git a/libs/orders/src/lib/components/order-feedback/order-feedback.tsx b/libs/orders/src/lib/components/order-feedback/order-feedback.tsx index 9abadc00b..a375ae5c7 100644 --- a/libs/orders/src/lib/components/order-feedback/order-feedback.tsx +++ b/libs/orders/src/lib/components/order-feedback/order-feedback.tsx @@ -84,11 +84,9 @@ const getRejectionReason = (order: OrderEventFieldsFragment): string | null => { Schema.OrderTimeInForceMapping[order.timeInForce] } order was not filled and it has been stopped` ); - case Schema.OrderStatus.STATUS_REJECTED: + default: return order.rejectionReason ? t(Schema.OrderRejectionReasonMapping[order.rejectionReason]) : null; - default: - return null; } }; diff --git a/libs/orders/src/lib/components/order-list/order-list.tsx b/libs/orders/src/lib/components/order-list/order-list.tsx index 4a311cfd1..74da7708c 100644 --- a/libs/orders/src/lib/components/order-list/order-list.tsx +++ b/libs/orders/src/lib/components/order-list/order-list.tsx @@ -249,7 +249,7 @@ export const OrderListTable = forwardRef( value, data, }: VegaValueFormatterParams) => { - if (value === Schema.OrderStatus.STATUS_REJECTED) { + if (data?.rejectionReason && value) { return `${Schema.OrderStatusMapping[value]}: ${ data?.rejectionReason && Schema.OrderRejectionReasonMapping[data.rejectionReason] diff --git a/libs/react-helpers/src/lib/format/number.tsx b/libs/react-helpers/src/lib/format/number.tsx index 8a2a46eef..51f0aea76 100644 --- a/libs/react-helpers/src/lib/format/number.tsx +++ b/libs/react-helpers/src/lib/format/number.tsx @@ -100,6 +100,16 @@ export const addDecimalsFormatNumber = ( return formatNumber(x, formatDecimals); }; +export const addDecimalsFixedFormatNumber = ( + rawValue: string | number, + decimalPlaces: number, + formatDecimals: number = decimalPlaces +) => { + const x = addDecimal(rawValue, decimalPlaces); + + return formatNumberFixed(x, formatDecimals); +}; + export const formatNumberPercentage = (value: BigNumber, decimals?: number) => { const decimalPlaces = typeof decimals === 'undefined' ? Math.max(value.dp() || 0, 2) : decimals; diff --git a/libs/types/src/global-types-mappings.ts b/libs/types/src/global-types-mappings.ts index 1b1eea9ac..22e732451 100644 --- a/libs/types/src/global-types-mappings.ts +++ b/libs/types/src/global-types-mappings.ts @@ -384,7 +384,7 @@ type TransferTypeMap = { export const TransferTypeMapping: TransferTypeMap = { TRANSFER_TYPE_UNSPECIFIED: 'Default value, always invalid', TRANSFER_TYPE_LOSS: 'Final settlement loss', - TRANSFER_TYPE_WIN: 'Final settlement win', + TRANSFER_TYPE_WIN: 'Final settlement gain', TRANSFER_TYPE_MTM_LOSS: 'Mark to market loss', TRANSFER_TYPE_MTM_WIN: 'Mark to market gain', TRANSFER_TYPE_MARGIN_LOW: 'Margin topped up',