From ea5a65998928c64b7973b50baff041abe7195a40 Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Mon, 27 Jun 2022 18:05:40 +0000 Subject: [PATCH 01/26] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 45 ++++++++++++------- apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index d20907146..a9aee3700 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "124661.013711767544930765", + "locked_amount": "124601.641497427509255225", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "65503.04337545080622283", + "locked_amount": "65444.804763955177665966", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "89531.35166557213976323285608", + "locked_amount": "89451.74953813444492797258996", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27555.99917099787937361", + "locked_amount": "27531.499192868696578092", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8969.210333073256934278", + "locked_amount": "8961.235827934368165759", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "15468.3027626811615", + "locked_amount": "15437.69814311594325", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1804379.69836047439128314", + "locked_amount": "1803049.503938571853074318", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "14760.0056484630890178248654459722", + "locked_amount": "14720.9131152249333952583887289144", "deposits": [ { "amount": "2833.333333", @@ -5228,7 +5228,7 @@ "tranche_end": "2022-09-03T00:00:00.000Z", "total_added": "19455.000000000000000003", "total_removed": "5056.88782409978", - "locked_amount": "3597.64752092846370375055476445966514475", + "locked_amount": "3584.30737252663537965055270738203957369", "deposits": [ { "amount": "75", @@ -14123,7 +14123,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2797204.7028220379638062054", + "locked_amount": "2795160.65712008198089933735", "deposits": [ { "amount": "1998.95815", @@ -14836,7 +14836,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "7926.7627792759659", - "locked_amount": "15140482.7365636033722263648641426217383077", + "locked_amount": "15133271.7893758539354164278444810704649905", "deposits": [ { "amount": "16249.93", @@ -16932,7 +16932,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2113641.840890679071831632", - "locked_amount": "8328080.66510881884167481291924447", + "locked_amount": "8321389.30717931793780845944742289", "deposits": [ { "amount": "129284.449", @@ -21034,8 +21034,8 @@ "tranche_start": "2021-10-05T00:00:00.000Z", "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", - "total_removed": "1390546.591547348229906227", - "locked_amount": "2973571.63505682836710488797665665", + "total_removed": "1394182.156241968429653227", + "locked_amount": "2970927.83906988644123723685573077", "deposits": [ { "amount": "552496.6455", @@ -21184,6 +21184,11 @@ "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", "tx": "0xa6b9993b9288eac739756499b2997155ce8b1bc6e862c1a6569c8e04463bb31f" }, + { + "amount": "3635.564694620199747", + "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", + "tx": "0x89b7e9f6200ba171c5f1115f9fd110284ef4ffaba58cf174b686bbe4905fe18a" + }, { "amount": "13341.31568777778021", "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", @@ -22018,6 +22023,12 @@ "tranche_id": 4, "tx": "0xa6b9993b9288eac739756499b2997155ce8b1bc6e862c1a6569c8e04463bb31f" }, + { + "amount": "3635.564694620199747", + "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", + "tranche_id": 4, + "tx": "0x89b7e9f6200ba171c5f1115f9fd110284ef4ffaba58cf174b686bbe4905fe18a" + }, { "amount": "13341.31568777778021", "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", @@ -22080,8 +22091,8 @@ } ], "total_tokens": "331498.5873", - "withdrawn_tokens": "157304.28913691490831", - "remaining_tokens": "174194.29816308509169" + "withdrawn_tokens": "160939.853831535108057", + "remaining_tokens": "170558.733468464891943" }, { "address": "0x16da609341ed67750A8BCC5AAa2005471006Cd77", @@ -22158,7 +22169,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "34.173053016", - "locked_amount": "443233.07466590775804275636428212", + "locked_amount": "442909.18394016956636625538102488", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index a78237143..97e355dac 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "41.663429096905125", + "locked_amount": "41.59485032978184", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "321.05967465753423", + "locked_amount": "320.305308219178073", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 52379dd1f..a85d73504 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "294.7911558219177930002918724315068493", + "locked_amount": "294.09851027397259430029118664383561643", "deposits": [ { "amount": "1000", From 3abc15e7bd72e800b92e9d5ee8e1c95761e07b91 Mon Sep 17 00:00:00 2001 From: Sam Keen Date: Mon, 27 Jun 2022 23:02:28 +0100 Subject: [PATCH 02/26] fix(#652): Fix broken lozenge dark mode text class --- libs/ui-toolkit/src/utils/intent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ui-toolkit/src/utils/intent.tsx b/libs/ui-toolkit/src/utils/intent.tsx index 6030cb773..d634847ec 100644 --- a/libs/ui-toolkit/src/utils/intent.tsx +++ b/libs/ui-toolkit/src/utils/intent.tsx @@ -30,7 +30,7 @@ export const getIntentBorder = (intent = Intent.None) => { export const getIntentTextAndBackground = (intent = Intent.None) => { return { - 'bg-black text-white dark:bg-white text-black': intent === Intent.None, + 'bg-black text-white dark:bg-white dark:text-black': intent === Intent.None, 'bg-vega-pink text-black dark:bg-vega-yellow dark:text-black-normal': intent === Intent.Primary, 'bg-danger text-white': intent === Intent.Danger, From b91e47115192103fd0ee2c704baf9fffdcf029be Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Tue, 28 Jun 2022 00:09:43 +0000 Subject: [PATCH 03/26] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 79 +++++++++++++------ apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 59 insertions(+), 26 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index a9aee3700..433a86e55 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "124601.641497427509255225", + "locked_amount": "124541.670728577396297675", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "65444.804763955177665966", + "locked_amount": "65385.979026243031840524", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "89451.74953813444492797258996", + "locked_amount": "89371.34491052188058194519116", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27531.499192868696578092", + "locked_amount": "27506.752220879351667332", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8961.235827934368165759", + "locked_amount": "8953.180928690767435732", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "15437.69814311594325", + "locked_amount": "15406.78498641304425", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1803049.503938571853074318", + "locked_amount": "1801705.899306533520677546", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "14720.9131152249333952583887289144", + "locked_amount": "14681.4264748721908031582383585289", "deposits": [ { "amount": "2833.333333", @@ -5228,7 +5228,7 @@ "tranche_end": "2022-09-03T00:00:00.000Z", "total_added": "19455.000000000000000003", "total_removed": "5056.88782409978", - "locked_amount": "3584.30737252663537965055270738203957369", + "locked_amount": "3570.83273687214539175055062956621004555", "deposits": [ { "amount": "75", @@ -14123,7 +14123,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2795160.65712008198089933735", + "locked_amount": "2793096.00459408760797563007", "deposits": [ { "amount": "1998.95815", @@ -14835,8 +14835,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", - "total_removed": "7926.7627792759659", - "locked_amount": "15133271.7893758539354164278444810704649905", + "total_removed": "8107.041625370683275", + "locked_amount": "15125988.1458096868577130475224974549067315", "deposits": [ { "amount": "16249.93", @@ -15360,6 +15360,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0xa79f7f3e6436a1f473f3beab9e0a5c8bc4f52b38ac7aedb8610a1a9a9c4a786c" }, + { + "amount": "180.278846094717375", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0xca332ec8365253d3b17445c182d287e56783ab4552f3581f3a43dc6334fbfc7b" + }, { "amount": "2446.31552516990115", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -15482,6 +15487,12 @@ "tranche_id": 2, "tx": "0xa79f7f3e6436a1f473f3beab9e0a5c8bc4f52b38ac7aedb8610a1a9a9c4a786c" }, + { + "amount": "180.278846094717375", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0xca332ec8365253d3b17445c182d287e56783ab4552f3581f3a43dc6334fbfc7b" + }, { "amount": "2446.31552516990115", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -15526,8 +15537,8 @@ } ], "total_tokens": "194999.1675", - "withdrawn_tokens": "7926.7627792759659", - "remaining_tokens": "187072.4047207240341" + "withdrawn_tokens": "8107.041625370683275", + "remaining_tokens": "186892.125874629316725" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -16931,8 +16942,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "2113641.840890679071831632", - "locked_amount": "8321389.30717931793780845944742289", + "total_removed": "2113973.548062967675092132", + "locked_amount": "8314630.49105389415467488089279676", "deposits": [ { "amount": "129284.449", @@ -17181,6 +17192,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xc62ffa6bf5029422f44d9406972fc074b498e02f667a86ae9faba138b6cfd758" }, + { + "amount": "331.7071722886032605", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0xc279c1a171709ff76a9875fea2e8f98ceb5797714ead511ba95a12f61412fc13" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -18799,6 +18815,12 @@ "tranche_id": 3, "tx": "0xc62ffa6bf5029422f44d9406972fc074b498e02f667a86ae9faba138b6cfd758" }, + { + "amount": "331.7071722886032605", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0xc279c1a171709ff76a9875fea2e8f98ceb5797714ead511ba95a12f61412fc13" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -20037,8 +20059,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "154092.9757912160630365", - "remaining_tokens": "205030.4937837839369635" + "withdrawn_tokens": "154424.682963504666297", + "remaining_tokens": "204698.786611495333703" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -21035,7 +21057,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1394182.156241968429653227", - "locked_amount": "2970927.83906988644123723685573077", + "locked_amount": "2968257.38994175232240675353663938", "deposits": [ { "amount": "552496.6455", @@ -22169,7 +22191,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "34.173053016", - "locked_amount": "442909.18394016956636625538102488", + "locked_amount": "442582.02794536869757046949162864", "deposits": [ { "amount": "3000", @@ -47847,7 +47869,7 @@ "tranche_start": "2021-12-05T00:00:00.000Z", "tranche_end": "2022-06-05T00:00:00.000Z", "total_added": "171288.42", - "total_removed": "32094.1716569431377", + "total_removed": "32195.2723545681377", "locked_amount": "0", "deposits": [ { @@ -52147,6 +52169,11 @@ "user": "0xDD5730a33719083470e641cF0e4154Dd04D5738d", "tx": "0x49bd6332008e65069aad8012f76f15f3dae19f664237b02f9152946297db812d" }, + { + "amount": "101.100697625", + "user": "0x6886CA9FfE30C5BB86590c71799Bf5550EDF845b", + "tx": "0x204f08eb22345e352efcbfd3921f813fdf1097ea3fc33b36387c3c1cc5678936" + }, { "amount": "183.6335597275", "user": "0x690Fc36d52eD3f198F0eBDea1557333a1766f786", @@ -53528,6 +53555,12 @@ } ], "withdrawals": [ + { + "amount": "101.100697625", + "user": "0x6886CA9FfE30C5BB86590c71799Bf5550EDF845b", + "tranche_id": 6, + "tx": "0x204f08eb22345e352efcbfd3921f813fdf1097ea3fc33b36387c3c1cc5678936" + }, { "amount": "148.899302375", "user": "0x6886CA9FfE30C5BB86590c71799Bf5550EDF845b", @@ -53536,8 +53569,8 @@ } ], "total_tokens": "250", - "withdrawn_tokens": "148.899302375", - "remaining_tokens": "101.100697625" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0xDFdC0c291ee8499777272ab3A7B786518c895966", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 97e355dac..9d15da0af 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "41.59485032978184", + "locked_amount": "41.5255898021309", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "320.305308219178073", + "locked_amount": "319.543442415017755", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index a85d73504..00ddef9e3 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "294.09851027397259430029118664383561643", + "locked_amount": "293.39897894469812050029049403855910705", "deposits": [ { "amount": "1000", From 5c57d0e433524bbd04e042ea6058d0f9889e010c Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Tue, 28 Jun 2022 06:04:43 +0000 Subject: [PATCH 04/26] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 87 ++++++++++++++----- apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 68 insertions(+), 25 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 433a86e55..1deefc105 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "124541.670728577396297675", + "locked_amount": "124483.18810901382949071", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "65385.979026243031840524", + "locked_amount": "65328.613024353622402932", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "89371.34491052188058194519116", + "locked_amount": "89292.9354897660958236986694", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27506.752220879351667332", + "locked_amount": "27482.619334542337820608", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8953.180928690767435732", + "locked_amount": "8945.325908368055074076", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "15406.78498641304425", + "locked_amount": "15376.6389266304345", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1801705.899306533520677546", + "locked_amount": "1800395.63565565830266335", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "14681.4264748721908031582383585289", + "locked_amount": "14642.9178709827210707074034432265", "deposits": [ { "amount": "2833.333333", @@ -5226,9 +5226,9 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "19455.000000000000000003", + "total_added": "19457.000000000000000003", "total_removed": "5056.88782409978", - "locked_amount": "3570.83273687214539175055062956621004555", + "locked_amount": "3558.0575871702178149005486032153729071", "deposits": [ { "amount": "75", @@ -5260,6 +5260,11 @@ "user": "0x3a380f7CFdEeb723228cA57d2795EA215094000d", "tx": "0x72adba1aa2d918148f1a95eb6a447da22fa06217cadafa94d56f12fd22a389be" }, + { + "amount": "2", + "user": "0xB2BddeEb907797F9be51E3f9f75824f83cD71B67", + "tx": "0x09792a45790c762f046f34979cbbe7687661ce7643da9ba6bc9c128710191b46" + }, { "amount": "30", "user": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", @@ -8669,6 +8674,21 @@ "withdrawn_tokens": "940.30940496195", "remaining_tokens": "649.69059503805" }, + { + "address": "0xB2BddeEb907797F9be51E3f9f75824f83cD71B67", + "deposits": [ + { + "amount": "2", + "user": "0xB2BddeEb907797F9be51E3f9f75824f83cD71B67", + "tranche_id": 11, + "tx": "0x09792a45790c762f046f34979cbbe7687661ce7643da9ba6bc9c128710191b46" + } + ], + "withdrawals": [], + "total_tokens": "2", + "withdrawn_tokens": "0", + "remaining_tokens": "2" + }, { "address": "0xb4eE687f019A8e48F7087f4b4f8653208B8cc48f", "deposits": [ @@ -14123,7 +14143,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2793096.00459408760797563007", + "locked_amount": "2791082.49102132778281379517", "deposits": [ { "amount": "1998.95815", @@ -14836,7 +14856,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", "total_removed": "8107.041625370683275", - "locked_amount": "15125988.1458096868577130475224974549067315", + "locked_amount": "15118884.9093110641233712416277066055785347", "deposits": [ { "amount": "16249.93", @@ -16943,7 +16963,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "2113973.548062967675092132", - "locked_amount": "8314630.49105389415467488089279676", + "locked_amount": "8308039.08265321489181290901077215", "deposits": [ { "amount": "129284.449", @@ -21056,8 +21076,8 @@ "tranche_start": "2021-10-05T00:00:00.000Z", "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", - "total_removed": "1394182.156241968429653227", - "locked_amount": "2968257.38994175232240675353663938", + "total_removed": "1404291.506600519461757227", + "locked_amount": "2965653.08461813796797857395205961", "deposits": [ { "amount": "552496.6455", @@ -21211,6 +21231,11 @@ "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", "tx": "0x89b7e9f6200ba171c5f1115f9fd110284ef4ffaba58cf174b686bbe4905fe18a" }, + { + "amount": "10109.350358551032104", + "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75", + "tx": "0xc695996be3df837d7040aec8c5532965ac6554d5615575ee46fc87d604e2ebc0" + }, { "amount": "13341.31568777778021", "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", @@ -21693,6 +21718,12 @@ } ], "withdrawals": [ + { + "amount": "10109.350358551032104", + "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75", + "tranche_id": 4, + "tx": "0xc695996be3df837d7040aec8c5532965ac6554d5615575ee46fc87d604e2ebc0" + }, { "amount": "7013.412182841867109", "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75", @@ -21749,8 +21780,8 @@ } ], "total_tokens": "110499.5291", - "withdrawn_tokens": "43654.936134887817154", - "remaining_tokens": "66844.592965112182846" + "withdrawn_tokens": "53764.286493438849258", + "remaining_tokens": "56735.242606561150742" }, { "address": "0xdbC5d439F373EB646345e1c67D1d46231ACE7dD3", @@ -22191,7 +22222,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "34.173053016", - "locked_amount": "442582.02794536869757046949162864", + "locked_amount": "442262.97521003070426656760324708", "deposits": [ { "amount": "3000", @@ -47869,7 +47900,7 @@ "tranche_start": "2021-12-05T00:00:00.000Z", "tranche_end": "2022-06-05T00:00:00.000Z", "total_added": "171288.42", - "total_removed": "32195.2723545681377", + "total_removed": "32445.2723545681377", "locked_amount": "0", "deposits": [ { @@ -52174,6 +52205,11 @@ "user": "0x6886CA9FfE30C5BB86590c71799Bf5550EDF845b", "tx": "0x204f08eb22345e352efcbfd3921f813fdf1097ea3fc33b36387c3c1cc5678936" }, + { + "amount": "250", + "user": "0xbCc28D073f7a96c0568D36FdB21A98105ee60Ca3", + "tx": "0xf1201851e334cac5ab0920f89874163c5074c608b8d810b5eb89fb62454ddc19" + }, { "amount": "183.6335597275", "user": "0x690Fc36d52eD3f198F0eBDea1557333a1766f786", @@ -65806,10 +65842,17 @@ "tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "250", + "user": "0xbCc28D073f7a96c0568D36FdB21A98105ee60Ca3", + "tranche_id": 6, + "tx": "0xf1201851e334cac5ab0920f89874163c5074c608b8d810b5eb89fb62454ddc19" + } + ], "total_tokens": "250", - "withdrawn_tokens": "0", - "remaining_tokens": "250" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0x8c951C54F9cd08Cf81F770248e835D7A4F491a46", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 9d15da0af..112e7ac87 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "41.5255898021309", + "locked_amount": "41.458044774226277", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "319.543442415017755", + "locked_amount": "318.80044710806699", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index 00ddef9e3..aaff83838 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "293.39897894469812050029049403855910705", + "locked_amount": "292.7167741628615090002898185882800609", "deposits": [ { "amount": "1000", From 51712f4c20b4cc1994dc416aada487bc7ec1bfba Mon Sep 17 00:00:00 2001 From: macqbat Date: Tue, 28 Jun 2022 11:57:47 +0200 Subject: [PATCH 05/26] Feat/526 consolelite design update market list (#635) * feat: [console-lite] - market list - improve list view * feat: [console-lite] - market list - add column sorting, improve ag-grid styles * feat: [console-lite] - market list - remove unnecessary changes * feat: [console-lite] - market list - fixes for eslint errors * feat: [console-lite] - market list - remove redundant changes * feat: [console-lite] - market list - add resize handler and other small improvements Co-authored-by: maciek --- .../__generated__/SimpleMarkets.ts | 4 + .../simple-market-list/constants.ts | 128 ++++++++++++++++-- .../simple-market-list/data-provider.ts | 1 + .../simple-market-list.spec.tsx | 17 ++- .../simple-market-list/simple-market-list.tsx | 121 ++++++++--------- .../simple-market-percent-change.spec.tsx | 25 +++- .../simple-market-percent-change.tsx | 21 ++- .../simple-market-renderer.tsx | 26 ++++ .../simple-market-toolbar.tsx | 4 +- .../src/app/hooks/use-column-definitions.tsx | 125 +++++++++++++++++ libs/tailwindcss-config/src/theme-lite.js | 12 ++ libs/tailwindcss-config/src/theme.js | 4 + .../src/components/ag-grid/ag-grid-dark.tsx | 11 +- .../ag-grid/ag-grid-dynamic-themed.tsx | 7 +- .../components/ag-grid/ag-grid-dynamic.tsx | 1 + .../src/components/ag-grid/ag-grid-light.tsx | 11 +- .../dropdown-menu/dropdown-menu.tsx | 6 +- 17 files changed, 425 insertions(+), 99 deletions(-) create mode 100644 apps/simple-trading-app/src/app/components/simple-market-list/simple-market-renderer.tsx create mode 100644 apps/simple-trading-app/src/app/hooks/use-column-definitions.tsx diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/__generated__/SimpleMarkets.ts b/apps/simple-trading-app/src/app/components/simple-market-list/__generated__/SimpleMarkets.ts index 9e9ce7943..efeb150a4 100644 --- a/apps/simple-trading-app/src/app/components/simple-market-list/__generated__/SimpleMarkets.ts +++ b/apps/simple-trading-app/src/app/components/simple-market-list/__generated__/SimpleMarkets.ts @@ -47,6 +47,10 @@ export interface SimpleMarkets_markets_tradableInstrument_instrument_product_set export interface SimpleMarkets_markets_tradableInstrument_instrument_product { __typename: "Future"; + /** + * String representing the quote (e.g. BTCUSD -> USD is quote) + */ + quoteName: string; /** * The name of the asset (string) */ diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/constants.ts b/apps/simple-trading-app/src/app/components/simple-market-list/constants.ts index 6ad352067..a346ab7bc 100644 --- a/apps/simple-trading-app/src/app/components/simple-market-list/constants.ts +++ b/apps/simple-trading-app/src/app/components/simple-market-list/constants.ts @@ -1,19 +1,5 @@ -import { Intent } from '@vegaprotocol/ui-toolkit'; -import { MarketState } from '@vegaprotocol/types'; import { t } from '@vegaprotocol/react-helpers'; - -export const MARKET_STATUS: Record = { - [MarketState.Active]: Intent.Success, - [MarketState.Cancelled]: Intent.Primary, - [MarketState.Closed]: Intent.None, - [MarketState.Pending]: Intent.Warning, - [MarketState.Proposed]: Intent.Warning, - [MarketState.Rejected]: Intent.Danger, - [MarketState.Settled]: Intent.Primary, - [MarketState.Suspended]: Intent.Warning, - [MarketState.TradingTerminated]: Intent.Danger, - '': Intent.Primary, -}; +import { themelite as theme } from '@vegaprotocol/tailwindcss-config'; export const STATES_FILTER = [ { value: 'all', text: t('All') }, @@ -27,3 +13,115 @@ export const STATES_FILTER = [ { value: 'Suspended', text: t('Suspended') }, { value: 'TradingTerminated', text: t('TradingTerminated') }, ]; + +export const agGridLightVariables = ` + .ag-theme-balham { + --ag-row-border-color: ${theme.colors.transparent}; + --ag-row-hover-color: ${theme.colors.transparent}; + --ag-font-size: 15px; + } + .ag-theme-balham .ag-row-hover { + --ag-row-border-color: ${theme.colors.black[100]}; + } + .ag-theme-balham [col-id="status"] .ag-header-cell-label, + .ag-theme-balham [col-id="asset"] .ag-header-cell-label, + .ag-theme-balham [col-id="change"] .ag-header-cell-label{ + justify-content: center; + } + .ag-theme-balham .ag-header-row .ag-header-cell:first-child{ + padding-left: 0; + } + .ag-theme-balham .ag-ltr .ag-header-cell::after, .ag-theme-balham .ag-ltr .ag-header-group-cell::after { + right: 0; + } + .ag-theme-balham .ag-header-cell::after{ + width: 0; + } + .ag-theme-balham .ag-header{ + border-bottom-width: 0; + } + .ag-theme-balham .ag-has-focus .ag-row.ag-row-focus .ag-cell-focus { + outline: none; + border-width: 0; + } + .ag-theme-balham .ag-header-label-icon .ag-icon{ + position: relative; + } + .ag-theme-balham .ag-icon::before{ + font-size: 10px; + line-height: 12px; + position: absolute; + transform: rotate(45deg); + top: -6px; + right: -14px; + content: "◾"; + background: -webkit-linear-gradient(135deg, rgba(0,0,0,0.54) 0%, rgba(0,0,0,0.54) 40%, rgba(0,0,0,0) 40%, rgba(0,0,0,0) 52%, rgba(0,0,0,0.54) 52%, rgba(0,0,0,0.54) 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + .ag-theme-balham .ag-icon-desc::before{ + background: -webkit-linear-gradient(135deg, #000 0%, #000 40%, rgba(0,0,0,0) 40%, rgba(0,0,0,0) 52%, rgba(0,0,0,0.54) 52%, rgba(0,0,0,0.54) 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + .ag-theme-balham .ag-icon-asc::before{ + background: -webkit-linear-gradient(135deg, rgba(0,0,0,0.54) 0%, rgba(0,0,0,0.54) 40%, rgba(0,0,0,0) 40%, rgba(0,0,0,0) 52%, #000 52%, #000 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } +`; + +export const agGridDarkVariables = ` + .ag-theme-balham-dark { + --ag-row-border-color: ${theme.colors.transparent}; + --ag-row-hover-color: ${theme.colors.transparent}; + --ag-font-size: 15px; + } + .ag-theme-balham-dark .ag-row-hover { + --ag-row-border-color: ${theme.colors.white[100]}; + } + .ag-theme-balham-dark [col-id="status"] .ag-header-cell-label, + .ag-theme-balham-dark [col-id="asset"] .ag-header-cell-label, + .ag-theme-balham-dark [col-id="change"] .ag-header-cell-label{ + justify-content: center; + } + .ag-theme-balham-dark .ag-header-row .ag-header-cell:first-child{ + padding-left: 0; + } + .ag-theme-balham-dark .ag-header-cell::after{ + width: 0; + } + .ag-theme-balham-dark .ag-header{ + border-bottom-width: 0; + } + .ag-theme-balham-dark .ag-has-focus .ag-row.ag-row-focus .ag-cell-focus { + outline: none; + border-width: 0; + } + .ag-theme-balham-dark .ag-header-label-icon .ag-icon{ + position: relative; + } + .ag-theme-balham-dark .ag-icon::before{ + font-size: 10px; + line-height: 12px; + position: absolute; + transform: rotate(45deg); + top: -6px; + right: -14px; + content: "◾"; + background: -webkit-linear-gradient(135deg, rgba(245, 245, 245, 0.64) 0%, rgba(245, 245, 245, 0.64) 40%, rgba(0,0,0,0) 40%, rgba(0,0,0,0) 52%, rgba(245, 245, 245, 0.64) 52%, rgba(245, 245, 245, 0.64) 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + background-position: center; + } + .ag-theme-balham-dark .ag-icon-desc::before{ + background: -webkit-linear-gradient(135deg, #fff 0%, #fff 40%, rgba(0,0,0,0) 40%, rgba(0,0,0,0) 52%, rgba(245, 245, 245, 0.64) 52%, rgba(245, 245, 245, 0.64) 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + .ag-theme-balham-dark .ag-icon-asc::before{ + background: -webkit-linear-gradient(135deg, rgba(245, 245, 245, 0.64) 0%, rgba(245, 245, 245, 0.64) 40%, rgba(0,0,0,0) 40%, rgba(0,0,0,0) 52%, #fff 52%, #fff 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } +`; diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/data-provider.ts b/apps/simple-trading-app/src/app/components/simple-market-list/data-provider.ts index 5e3a4ad73..4466ba980 100644 --- a/apps/simple-trading-app/src/app/components/simple-market-list/data-provider.ts +++ b/apps/simple-trading-app/src/app/components/simple-market-list/data-provider.ts @@ -36,6 +36,7 @@ export const MARKETS_QUERY = gql` product { __typename ... on Future { + quoteName settlementAsset { symbol } diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-list.spec.tsx b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-list.spec.tsx index 3268c1f96..c2776419f 100644 --- a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-list.spec.tsx +++ b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-list.spec.tsx @@ -1,6 +1,12 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; -import { render, screen, waitFor } from '@testing-library/react'; +import { + render, + screen, + waitFor, + cleanup, + getAllByRole, +} from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; import type { MockedResponse } from '@apollo/client/testing'; import { BrowserRouter } from 'react-router-dom'; @@ -37,6 +43,7 @@ describe('SimpleMarketList', () => { afterEach(() => { jest.clearAllMocks(); + cleanup(); }); it('should be properly renderer as empty', async () => { @@ -130,8 +137,12 @@ describe('SimpleMarketList', () => { await new Promise((resolve) => setTimeout(resolve, 0)); }); await waitFor(() => { - expect(screen.getByTestId('simple-market-list')).toBeInTheDocument(); + expect( + document.querySelector('.ag-center-cols-container') + ).toBeInTheDocument(); }); - expect(screen.getByTestId('simple-market-list').children).toHaveLength(2); + + const container = document.querySelector('.ag-center-cols-container'); + expect(getAllByRole(container as HTMLDivElement, 'row')).toHaveLength(2); }); }); diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-list.tsx b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-list.tsx index f5ae85aab..391e9efe7 100644 --- a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-list.tsx +++ b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-list.tsx @@ -1,17 +1,29 @@ -import React, { useCallback, useEffect, useMemo, useRef } from 'react'; +import React, { + useCallback, + useContext, + useEffect, + useMemo, + useRef, +} from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import { subDays } from 'date-fns'; +import type { AgGridReact } from 'ag-grid-react'; +import { AgGridDynamic as AgGrid } from '@vegaprotocol/ui-toolkit'; import { useDataProvider } from '@vegaprotocol/react-helpers'; import { t } from '@vegaprotocol/react-helpers'; -import { AsyncRenderer, Lozenge, Splash } from '@vegaprotocol/ui-toolkit'; -import { Button } from '@vegaprotocol/ui-toolkit'; +import { AsyncRenderer } from '@vegaprotocol/ui-toolkit'; +import { ThemeContext } from '@vegaprotocol/react-helpers'; import type { MarketState } from '@vegaprotocol/types'; -import SimpleMarketPercentChange from './simple-market-percent-change'; -import SimpleMarketExpires from './simple-market-expires'; -import DataProvider from './data-provider'; -import { MARKET_STATUS } from './constants'; -import SimpleMarketToolbar from './simple-market-toolbar'; import useMarketsFilterData from '../../hooks/use-markets-filter-data'; +import useColumnDefinitions from '../../hooks/use-column-definitions'; +import DataProvider from './data-provider'; +import * as constants from './constants'; +import SimpleMarketToolbar from './simple-market-toolbar'; +import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets'; + +export type SimpleMarketsType = SimpleMarkets_markets & { + percentChange?: number | '-'; +}; export type RouterParams = Partial<{ product: string; @@ -22,8 +34,9 @@ export type RouterParams = Partial<{ const SimpleMarketList = () => { const navigate = useNavigate(); const params = useParams(); - + const theme = useContext(ThemeContext); const statusesRef = useRef>({}); + const gridRef = useRef(null); const variables = useMemo( () => ({ CandleSince: subDays(Date.now(), 1).toJSON(), @@ -40,7 +53,14 @@ const SimpleMarketList = () => { update, variables ); - const localData = useMarketsFilterData(data || [], params); + const localData: Array = useMarketsFilterData( + data || [], + params + ); + + const handleOnGridReady = useCallback(() => { + gridRef.current?.api.sizeColumnsToFit(); + }, [gridRef]); useEffect(() => { const statuses: Record = {}; @@ -50,6 +70,11 @@ const SimpleMarketList = () => { statusesRef.current = statuses; }, [data, statusesRef]); + useEffect(() => { + window.addEventListener('resize', handleOnGridReady); + return () => window.removeEventListener('resize', handleOnGridReady); + }, [handleOnGridReady]); + const onClick = useCallback( (marketId) => { navigate(`/trading/${marketId}`); @@ -57,62 +82,34 @@ const SimpleMarketList = () => { [navigate] ); + const { columnDefs, defaultColDef } = useColumnDefinitions({ onClick }); + + const getRowId = useCallback(({ data }) => data.id, []); + return ( - <> +
- {localData && localData.length > 0 ? ( -
    - {localData?.map((market) => ( -
  • -
    -
    -
    {market.name}
    - -
    {`${t('settled in')} ${ - market.tradableInstrument.instrument.product - .settlementAsset.symbol - }`}
    -
    -
    -
    - -
    -
    - - {market.data?.market.state} - -
    -
    -
    -
    -
    -
    • - ))} -
- ) : ( - {t('No data to display')} - )} + - +
); }; diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-percent-change.spec.tsx b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-percent-change.spec.tsx index 0e6d4e733..b6d89c262 100644 --- a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-percent-change.spec.tsx +++ b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-percent-change.spec.tsx @@ -7,11 +7,16 @@ import type { SimpleMarkets_markets_candles } from './__generated__/SimpleMarket describe('SimpleMarketPercentChange should parse proper change', () => { let candles: (SimpleMarkets_markets_candles | null)[] | null; + const setValue = () => undefined; it('empty array', () => { candles = []; render( - + ); expect(screen.getByText('-')).toBeInTheDocument(); @@ -20,7 +25,11 @@ describe('SimpleMarketPercentChange should parse proper change', () => { candles = null; render( - + ); expect(screen.getByText('-')).toBeInTheDocument(); @@ -33,7 +42,11 @@ describe('SimpleMarketPercentChange should parse proper change', () => { ]; render( - + ); expect(screen.getByText('100.000%')).toBeInTheDocument(); @@ -49,7 +62,11 @@ describe('SimpleMarketPercentChange should parse proper change', () => { ]; render( - + ); expect(screen.getByText('-50.000%')).toBeInTheDocument(); diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-percent-change.tsx b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-percent-change.tsx index e4c094736..9b0ade0d3 100644 --- a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-percent-change.tsx +++ b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-percent-change.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { InView } from 'react-intersection-observer'; import { useSubscription } from '@apollo/client'; import { themelite as theme } from '@vegaprotocol/tailwindcss-config'; @@ -12,6 +12,7 @@ import { CANDLE_SUB } from './data-provider'; interface Props { candles: (SimpleMarkets_markets_candles | null)[] | null; marketId: string; + setValue: (arg: unknown) => void; } const getChange = ( @@ -51,20 +52,32 @@ const SimpleMarketPercentChangeWrapper = (props: Props) => { return ( // @ts-ignore falsy wrong type? - + {inView && } ); }; -const SimpleMarketPercentChange = ({ candles, marketId }: Props) => { +const SimpleMarketPercentChange = ({ candles, marketId, setValue }: Props) => { const { data: { candles: { close = undefined } = {} } = {} } = useSubscription(CANDLE_SUB, { variables: { marketId }, }); const change = getChange(candles, close); const color = getColor(change); - return

{change}

; + useEffect(() => { + const value = parseFloat(change); + setValue(isNaN(value) ? '-' : value); + }, [setValue, change]); + + return ( +
+ {change} +
+ ); }; export default SimpleMarketPercentChangeWrapper; diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-renderer.tsx b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-renderer.tsx new file mode 100644 index 000000000..5d26e330d --- /dev/null +++ b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-renderer.tsx @@ -0,0 +1,26 @@ +import React from 'react'; +import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets'; +import SimpleMarketExpires from './simple-market-expires'; + +interface Props { + data: SimpleMarkets_markets; +} + +const MarketNameRenderer = ({ data }: Props) => { + return ( +
+
+
+ {data.name}{' '} + +
+
+ {data.tradableInstrument.instrument.product.quoteName} +
+
+ ); +}; + +export default MarketNameRenderer; diff --git a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-toolbar.tsx b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-toolbar.tsx index c250871aa..48e7fc78f 100644 --- a/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-toolbar.tsx +++ b/apps/simple-trading-app/src/app/components/simple-market-list/simple-market-toolbar.tsx @@ -67,7 +67,7 @@ const SimpleMarketToolbar = () => { ); return ( -
+
    {
{activeNumber > 0 && (
    diff --git a/apps/simple-trading-app/src/app/hooks/use-column-definitions.tsx b/apps/simple-trading-app/src/app/hooks/use-column-definitions.tsx new file mode 100644 index 000000000..a3882fc93 --- /dev/null +++ b/apps/simple-trading-app/src/app/hooks/use-column-definitions.tsx @@ -0,0 +1,125 @@ +import React, { useMemo } from 'react'; +import { t } from '@vegaprotocol/react-helpers'; +import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets'; +import MarketNameRenderer from '../components/simple-market-list/simple-market-renderer'; +import SimpleMarketPercentChange from '../components/simple-market-list/simple-market-percent-change'; +import { Button } from '@vegaprotocol/ui-toolkit'; +import type { ValueSetterParams } from 'ag-grid-community'; +import type { SimpleMarketsType } from '../components/simple-market-list/simple-market-list'; + +interface Props { + onClick: (marketId: string) => void; +} + +const useColumnDefinitions = ({ onClick }: Props) => { + const columnDefs = useMemo(() => { + return [ + { + colId: 'market', + headerName: t('Markets'), + headerClass: 'uppercase', + minWidth: 300, + field: 'name', + cellRenderer: ({ data }: { data: SimpleMarketsType }) => ( + + ), + }, + { + colId: 'asset', + headerName: t('Settlement asset'), + headerClass: 'uppercase', + minWidth: 100, + cellClass: 'uppercase flex h-full items-center', + field: 'tradableInstrument.instrument.product.settlementAsset.symbol', + cellRenderer: ({ data }: { data: SimpleMarketsType }) => ( +
    + {data.tradableInstrument.instrument.product.settlementAsset.symbol} +
    + ), + }, + { + colId: 'change', + headerName: t('24h change'), + headerClass: 'uppercase', + field: 'percentChange', + minWidth: 100, + valueSetter: (params: ValueSetterParams): boolean => { + const { oldValue, newValue, api, data } = params; + if (oldValue !== newValue) { + const newdata = { percentChange: newValue, ...data }; + api.applyTransaction({ update: [newdata] }); + return true; + } + return false; + }, + cellRenderer: ({ + data, + setValue, + }: { + data: SimpleMarketsType; + setValue: (arg: unknown) => void; + }) => ( + + ), + comparator: (valueA: number | '-', valueB: number | '-') => { + if (valueA === valueB) return 0; + if (valueA === '-') { + return -1; + } + if (valueB === '-') { + return 1; + } + return valueA > valueB ? 1 : -1; + }, + }, + { + colId: 'status', + headerName: t('Status'), + field: 'data.market.state', + headerClass: 'uppercase', + minWidth: 100, + cellRenderer: ({ data }: { data: SimpleMarkets_markets }) => ( +
    +
    + {data.data?.market.state} +
    +
    + ), + }, + { + colId: 'trade', + headerName: '', + headerClass: 'uppercase', + sortable: false, + minWidth: 100, + cellRenderer: ({ data }: { data: SimpleMarkets_markets }) => ( +
    + +
    + ), + }, + ]; + }, [onClick]); + + const defaultColDef = useMemo(() => { + return { + sortable: true, + unSortIcon: true, + }; + }, []); + + return { columnDefs, defaultColDef }; +}; + +export default useColumnDefinitions; diff --git a/libs/tailwindcss-config/src/theme-lite.js b/libs/tailwindcss-config/src/theme-lite.js index 125e540e0..1920a316d 100644 --- a/libs/tailwindcss-config/src/theme-lite.js +++ b/libs/tailwindcss-config/src/theme-lite.js @@ -12,9 +12,21 @@ module.exports = { mint: '#00F780', pink: '#FF077F', blue: '#2E6DE5', + vega: { + ...theme.colors.vega, + 'highlight-item': '#000', + 'highlight-item-dark': '#fff', + }, + 'dropdown-bg-dark': theme.colors.black['100'], }, fontSize: { ...theme.fontSize, capMenu: ['15px', { lineHeight: '24px', letterSpacing: '-0.01em' }], + market: ['15px', { lineHeight: '24px' }], + }, + boxShadow: { + ...theme.boxShadow, + 'inset-black': '', + 'inset-white': '', }, }; diff --git a/libs/tailwindcss-config/src/theme.js b/libs/tailwindcss-config/src/theme.js index 8ffdc2e21..6001a1b68 100644 --- a/libs/tailwindcss-config/src/theme.js +++ b/libs/tailwindcss-config/src/theme.js @@ -55,6 +55,8 @@ const colours = { 'green-dark': '#008545', red: '#FF261A', 'red-dark': '#EB001B', + 'highlight-item': '#FF077F', + 'highlight-item-dark': '#DFFF0B', }, blue: '#1DA2FB', coral: '#FF6057', @@ -65,6 +67,8 @@ const colours = { selected: '#DFFF0B', success: '#00F780', 'danger-bg': '#9E0025', // for white text + 'dropdown-bg': '#FFF', + 'dropdown-bg-dark': shadeOfGray(100 - 60), }; const boxShadowPosition = { diff --git a/libs/ui-toolkit/src/components/ag-grid/ag-grid-dark.tsx b/libs/ui-toolkit/src/components/ag-grid/ag-grid-dark.tsx index 84410d393..9f84adf72 100644 --- a/libs/ui-toolkit/src/components/ag-grid/ag-grid-dark.tsx +++ b/libs/ui-toolkit/src/components/ag-grid/ag-grid-dark.tsx @@ -27,9 +27,16 @@ const agGridDarkVariables = ` } `; -export const AgGrid = (props: { children: ReactNode }) => ( +export const AgGrid = ({ + children, + customThemeParams, +}: { + children: ReactNode; + customThemeParams?: string; +}) => ( <> - {props.children} + {customThemeParams && } + {children} ); diff --git a/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic-themed.tsx b/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic-themed.tsx index 52b9cf1e7..39ee2ca36 100644 --- a/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic-themed.tsx +++ b/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic-themed.tsx @@ -8,6 +8,7 @@ import 'ag-grid-community/dist/styles/ag-grid.css'; interface GridProps { children: ReactNode; + customThemeParams: string; } const AgGridLightTheme = dynamic( @@ -24,11 +25,13 @@ export const AgGridThemed = ({ style, className, gridRef, + customThemeParams = '', ...props }: (AgGridReactProps | AgReactUiProps) & { style?: React.CSSProperties; className?: string; gridRef?: React.ForwardedRef; + customThemeParams?: string; }) => { const theme = useContext(ThemeContext); const defaultProps = { rowHeight: 20, headerHeight: 22 }; @@ -40,11 +43,11 @@ export const AgGridThemed = ({ style={style} > {theme === 'dark' ? ( - + ) : ( - + )} diff --git a/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic.tsx b/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic.tsx index 0c49a05b6..e722af2ec 100644 --- a/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic.tsx +++ b/libs/ui-toolkit/src/components/ag-grid/ag-grid-dynamic.tsx @@ -11,6 +11,7 @@ type Props = (AgGridReactProps | AgReactUiProps) & { style?: React.CSSProperties; className?: string; gridRef?: React.Ref; + customThemeParams?: string; }; // https://stackoverflow.com/questions/69433673/nextjs-reactdomserver-does-not-yet-support-suspense diff --git a/libs/ui-toolkit/src/components/ag-grid/ag-grid-light.tsx b/libs/ui-toolkit/src/components/ag-grid/ag-grid-light.tsx index 06fac8fa1..e016fd5d6 100644 --- a/libs/ui-toolkit/src/components/ag-grid/ag-grid-light.tsx +++ b/libs/ui-toolkit/src/components/ag-grid/ag-grid-light.tsx @@ -27,9 +27,16 @@ const agGridLightVariables = ` } `; -export const AgGrid = (props: { children: ReactNode }) => ( +export const AgGrid = ({ + children, + customThemeParams, +}: { + children: ReactNode; + customThemeParams?: string; +}) => ( <> - {props.children} + {customThemeParams && } + {children} ); diff --git a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx index 7eaaf2529..1a11bb28f 100644 --- a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx +++ b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx @@ -13,7 +13,7 @@ const itemClass = classNames( 'hover:cursor-pointer', 'select-none', 'whitespace-nowrap', - 'focus:bg-vega-pink dark:focus:bg-vega-yellow', + 'focus:bg-vega-highlight-item dark:focus:bg-vega-highlight-item-dark', 'focus:text-white dark:focus:text-black', 'focus:outline-none' ); @@ -23,7 +23,7 @@ function getItemClasses(inset: boolean, checked?: boolean) { itemClass, inset ? 'pl-28' : 'pl-8', checked - ? 'bg-vega-pink dark:bg-vega-yellow text-white dark:text-black' + ? 'bg-vega-highlight-item dark:bg-vega-highlight-item-dark text-white dark:text-black' : 'text-black dark:text-white' ); } @@ -73,7 +73,7 @@ export const DropdownMenuContent = forwardRef< {...contentProps} ref={forwardedRef} className={classNames( - 'inline-block box-border border-1 border-black bg-white dark:bg-black-60', + 'inline-block box-border border-1 border-black bg-dropdown-bg dark:bg-dropdown-bg-dark', className )} /> From 7e0ca3790cf4cf42f36d2655955f7e2ab198f6fa Mon Sep 17 00:00:00 2001 From: mattrussell36 Date: Tue, 28 Jun 2022 12:04:56 +0000 Subject: [PATCH 06/26] chore: update tranches Signed-off-by: github-actions[bot] --- apps/static/src/assets/mainnet-tranches.json | 62 +++++++++++++------ apps/static/src/assets/stagnet1-tranches.json | 4 +- apps/static/src/assets/testnet-tranches.json | 2 +- 3 files changed, 45 insertions(+), 23 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 1deefc105..decba0236 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "124483.18810901382949071", + "locked_amount": "124423.8433513027126629", "deposits": [ { "amount": "129999.45", @@ -488,7 +488,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "65328.613024353622402932", + "locked_amount": "65270.401345253244874452", "deposits": [ { "amount": "97499.58", @@ -521,7 +521,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "0", - "locked_amount": "89292.9354897660958236986694", + "locked_amount": "89213.37017426303026243839204", "deposits": [ { "amount": "135173.4239508", @@ -554,7 +554,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "27482.619334542337820608", + "locked_amount": "27458.130686406737938644", "deposits": [ { "amount": "32499.86", @@ -587,7 +587,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "8945.325908368055074076", + "locked_amount": "8937.355091032134118014", "deposits": [ { "amount": "10833.29", @@ -675,7 +675,7 @@ "tranche_end": "2022-11-01T00:00:00.000Z", "total_added": "22500", "total_removed": "0", - "locked_amount": "15376.6389266304345", + "locked_amount": "15346.0484601449265", "deposits": [ { "amount": "15000", @@ -761,7 +761,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "0", - "locked_amount": "1800395.63565565830266335", + "locked_amount": "1799066.05638100981743129", "deposits": [ { "amount": "1852091.69", @@ -1777,7 +1777,7 @@ "tranche_end": "2022-09-30T00:00:00.000Z", "total_added": "60916.66666633337", "total_removed": "18705.279504739679372649", - "locked_amount": "14642.9178709827210707074034432265", + "locked_amount": "14603.8452238833747901701487917494", "deposits": [ { "amount": "2833.333333", @@ -5228,7 +5228,7 @@ "tranche_end": "2022-09-03T00:00:00.000Z", "total_added": "19457.000000000000000003", "total_removed": "5056.88782409978", - "locked_amount": "3558.0575871702178149005486032153729071", + "locked_amount": "3544.72285413495718791054654718417047189", "deposits": [ { "amount": "75", @@ -14143,7 +14143,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "74162.9780761646031", - "locked_amount": "2791082.49102132778281379517", + "locked_amount": "2789039.48511324599689800756", "deposits": [ { "amount": "1998.95815", @@ -14855,8 +14855,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15788853.065470999700000001", - "total_removed": "8107.041625370683275", - "locked_amount": "15118884.9093110641233712416277066055785347", + "total_removed": "8280.224305510700025", + "locked_amount": "15111677.630289199680935216829653936631522", "deposits": [ { "amount": "16249.93", @@ -15385,6 +15385,11 @@ "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", "tx": "0xca332ec8365253d3b17445c182d287e56783ab4552f3581f3a43dc6334fbfc7b" }, + { + "amount": "173.18268014001675", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0x793dabbba22d3e8e88f7600162ee6456d6d1b58e49ce07209d3f97eaa485161f" + }, { "amount": "2446.31552516990115", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -15513,6 +15518,12 @@ "tranche_id": 2, "tx": "0xca332ec8365253d3b17445c182d287e56783ab4552f3581f3a43dc6334fbfc7b" }, + { + "amount": "173.18268014001675", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0x793dabbba22d3e8e88f7600162ee6456d6d1b58e49ce07209d3f97eaa485161f" + }, { "amount": "2446.31552516990115", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -15557,8 +15568,8 @@ } ], "total_tokens": "194999.1675", - "withdrawn_tokens": "8107.041625370683275", - "remaining_tokens": "186892.125874629316725" + "withdrawn_tokens": "8280.224305510700025", + "remaining_tokens": "186718.943194489299975" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -16962,8 +16973,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "2113973.548062967675092132", - "locked_amount": "8308039.08265321489181290901077215", + "total_removed": "2114294.704069209419892882", + "locked_amount": "8301351.12857763653463313519166892", "deposits": [ { "amount": "129284.449", @@ -17217,6 +17228,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xc279c1a171709ff76a9875fea2e8f98ceb5797714ead511ba95a12f61412fc13" }, + { + "amount": "321.15600624174480075", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0x7289f6af545a72235c26ecd98b8a0c14fbb5e62af98ded20862cfad2ef59d3bc" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -18841,6 +18857,12 @@ "tranche_id": 3, "tx": "0xc279c1a171709ff76a9875fea2e8f98ceb5797714ead511ba95a12f61412fc13" }, + { + "amount": "321.15600624174480075", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0x7289f6af545a72235c26ecd98b8a0c14fbb5e62af98ded20862cfad2ef59d3bc" + }, { "amount": "652.48254356494551875", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -20079,8 +20101,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "154424.682963504666297", - "remaining_tokens": "204698.786611495333703" + "withdrawn_tokens": "154745.83896974641109775", + "remaining_tokens": "204377.63060525358890225" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -21077,7 +21099,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", "total_removed": "1404291.506600519461757227", - "locked_amount": "2965653.08461813796797857395205961", + "locked_amount": "2963010.63351446684468513060416848", "deposits": [ { "amount": "552496.6455", @@ -22222,7 +22244,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "34.173053016", - "locked_amount": "442262.97521003070426656760324708", + "locked_amount": "441939.24924557548066024309690512", "deposits": [ { "amount": "3000", diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json index 112e7ac87..c91b752f1 100644 --- a/apps/static/src/assets/stagnet1-tranches.json +++ b/apps/static/src/assets/stagnet1-tranches.json @@ -38,7 +38,7 @@ "tranche_end": "2022-11-26T13:48:10.000Z", "total_added": "100", "total_removed": "0", - "locked_amount": "41.458044774226277", + "locked_amount": "41.38951674277017", "deposits": [ { "amount": "100", @@ -242,7 +242,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1100", "total_removed": "673.04388635", - "locked_amount": "318.80044710806699", + "locked_amount": "318.046638762049714", "deposits": [ { "amount": "1000", diff --git a/apps/static/src/assets/testnet-tranches.json b/apps/static/src/assets/testnet-tranches.json index aaff83838..0bd7680cf 100644 --- a/apps/static/src/assets/testnet-tranches.json +++ b/apps/static/src/assets/testnet-tranches.json @@ -69,7 +69,7 @@ "tranche_end": "2022-10-12T00:53:20.000Z", "total_added": "1010.000000000000000001", "total_removed": "668.4622323651", - "locked_amount": "292.7167741628615090002898185882800609", + "locked_amount": "292.02467307204467760028913333967529176", "deposits": [ { "amount": "1000", From b3ce40da7f88352969e83107cd01e0a4423e8e6e Mon Sep 17 00:00:00 2001 From: Sam Keen Date: Tue, 28 Jun 2022 14:41:43 +0100 Subject: [PATCH 07/26] Feat/629 Clean up Token styling (#650) * frontend-monorepo-629: Made nav consistent with TFE and added focus-visible states * frontend-monorepo-629: Header icons working * frontend-monorepo-629: Tweak of header spacing * frontend-monorepo-629: Text styles and spacing on all routes bar governance * frontend-monorepo-629: Minor tweaks to font styles * frontend-monorepo-629: Removed import from older solution * frontend-monorepo-629: Evened up wallet padding to better suit the new button shadow styles * frontend-monorepo-629: White text and mono font where needed in the eth wallet * frontend-monorepo-629: Set only page header to use alpha lyrae * frontend-monorepo-629: More use of mono font for balances and some text alignment * frontend-monorepo-629: Keypair name element only rendered when name present * frontend-monorepo-629: Stopped header title overflow on small screens * frontend-monorepo-629: Button height established with padding to allow longer button text without overflow * frontend-monorepo-629: Mobile wallet title/key alignment improved for mobile * frontend-monorepo-629: Associated vega in wallet dark mode on * frontend-monorepo-629: Removed redundant classes on eth wallet connect button * frontend-monorepo-629: Vega wallet spacing tweaks --- .../src/components/app-footer/app-footer.tsx | 2 +- .../bullet-header/bullet-header.tsx | 5 +- .../connected-vega-key.tsx.tsx | 4 +- .../src/components/eth-wallet/eth-wallet.tsx | 18 ++- apps/token/src/components/heading/heading.tsx | 4 +- apps/token/src/components/heading/index.ts | 2 +- .../locked-progress/locked-progress.tsx | 6 +- apps/token/src/components/nav/nav.tsx | 124 +++++++++++++++--- .../transaction-complete.tsx | 8 +- .../transaction-callout/transaction-error.tsx | 6 +- .../transaction-pending.tsx | 8 +- .../vega-wallet/download-wallet-prompt.tsx | 10 +- .../components/vega-wallet/vega-wallet.tsx | 17 ++- .../components/wallet-card/wallet-card.tsx | 24 ++-- .../web3-connector/web3-connector.tsx | 2 +- .../proposal-terms-json.tsx | 2 +- .../proposals-list/proposals-list.tsx | 8 +- .../components/vote-details/vote-details.tsx | 4 +- apps/token/src/routes/home/index.tsx | 24 ++-- .../token-details-circulating.tsx | 2 +- .../home/token-details/token-details.tsx | 14 +- .../home/redemption-information.tsx | 28 ++-- .../src/routes/redemption/redemption.tsx | 2 +- .../src/routes/redemption/tranche/index.tsx | 6 +- apps/token/src/routes/rewards/home/index.tsx | 4 +- .../src/routes/rewards/home/reward-info.tsx | 2 +- .../staking/associate/associate-info.tsx | 2 +- .../associate/associate-transaction.tsx | 6 +- .../disassociate/disassociate-page.tsx | 12 +- .../token/src/routes/staking/staking-form.tsx | 6 +- .../token/src/routes/staking/staking-node.tsx | 5 +- apps/token/src/routes/staking/staking.tsx | 30 +++-- apps/token/src/routes/staking/your-stake.tsx | 2 +- apps/token/src/routes/tranches/tranche.tsx | 2 +- apps/token/src/routes/tranches/tranches.tsx | 6 +- apps/token/src/routes/withdraw/index.tsx | 4 +- apps/token/src/routes/withdrawals/index.tsx | 2 +- apps/token/src/styles.css | 12 ++ .../src/components/button/button.tsx | 3 +- 39 files changed, 264 insertions(+), 164 deletions(-) diff --git a/apps/token/src/components/app-footer/app-footer.tsx b/apps/token/src/components/app-footer/app-footer.tsx index ecdbacf5c..909abc010 100644 --- a/apps/token/src/components/app-footer/app-footer.tsx +++ b/apps/token/src/components/app-footer/app-footer.tsx @@ -7,7 +7,7 @@ import { ENV } from '../../config/env'; export const AppFooter = () => { return (