From 7f94f7b1c4d148b498d505f0c006883e33911dc2 Mon Sep 17 00:00:00 2001 From: flashburst <82953782+flashburst@users.noreply.github.com> Date: Tue, 18 Jun 2024 13:48:47 +0530 Subject: [PATCH 1/6] Fix typo --- src/common/BarChart.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/BarChart.jsx b/src/common/BarChart.jsx index ef7f0aa5e..bcc5e1ae4 100644 --- a/src/common/BarChart.jsx +++ b/src/common/BarChart.jsx @@ -55,7 +55,7 @@ export function BarChart ({ labels, yAxisData, loading, formatTooltipLabel = und }, ticks: { callback: function (val) { - return val === 0 ? 0 : formatCurrency(this.getLabelForValue(val).replace(/,/g, ''), router.locale, '', true, true).short + return val === 0 ? 0 : formatCurrency(this.getLabelForValue(val).replace(/,/g, ''), router.locale, '', true).short } } } From f7323b2653fe85e07149f753d3f04866eb7ab262 Mon Sep 17 00:00:00 2001 From: flashburst <82953782+flashburst@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:18:48 +0530 Subject: [PATCH 2/6] Fix report form styles --- src/modules/reporting/DisputeFormSkeleton.jsx | 2 +- src/modules/reporting/NewDisputeReportForm.jsx | 2 +- src/modules/reporting/NewIncidentReportForm.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/reporting/DisputeFormSkeleton.jsx b/src/modules/reporting/DisputeFormSkeleton.jsx index e5f1a3602..75ae533ca 100644 --- a/src/modules/reporting/DisputeFormSkeleton.jsx +++ b/src/modules/reporting/DisputeFormSkeleton.jsx @@ -4,7 +4,7 @@ import { Skeleton } from '@/common/Skeleton/Skeleton' export const DisputeFormSkeleton = () => { return ( -
+
diff --git a/src/modules/reporting/NewDisputeReportForm.jsx b/src/modules/reporting/NewDisputeReportForm.jsx index 4d8bbfdfe..664817a2a 100644 --- a/src/modules/reporting/NewDisputeReportForm.jsx +++ b/src/modules/reporting/NewDisputeReportForm.jsx @@ -112,7 +112,7 @@ export const NewDisputeReportForm = ({ data-testid='dispute-report-form' ref={form} onSubmit={onSubmit} - className='px-2 mx-auto bg-white border rounded-lg max-w-7xl md:py-16 md:px-24 border-B0C4DB' + className='px-2 mx-auto bg-white rounded-lg md:border max-w-7xl md:py-16 md:px-24 border-B0C4DB' >

Submit Your Dispute diff --git a/src/modules/reporting/NewIncidentReportForm.jsx b/src/modules/reporting/NewIncidentReportForm.jsx index 250926764..d9b0b6c08 100644 --- a/src/modules/reporting/NewIncidentReportForm.jsx +++ b/src/modules/reporting/NewIncidentReportForm.jsx @@ -150,7 +150,7 @@ export function NewIncidentReportForm ({ coverKey, productKey, minReportingStake data-testid='incident-report-form' ref={form} onSubmit={onSubmit} - className='px-2 mx-auto bg-white border rounded-lg max-w-7xl md:py-16 md:px-24 border-B0C4DB' + className='px-2 mx-auto bg-white rounded-lg md:border max-w-7xl md:py-16 md:px-24 border-B0C4DB' >

{/* @note: Intentional Capitalization of the word "Incident" below */} From 239fa26342c2667447584e1566a3e84f690e5e8c Mon Sep 17 00:00:00 2001 From: flashburst <82953782+flashburst@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:10:09 +0530 Subject: [PATCH 3/6] Fix product status badge --- src/common/CardStatusBadge.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/CardStatusBadge.jsx b/src/common/CardStatusBadge.jsx index 33d2642b7..5bf7dc70e 100644 --- a/src/common/CardStatusBadge.jsx +++ b/src/common/CardStatusBadge.jsx @@ -17,6 +17,7 @@ export function identifyStatus (status, defaultValue = E_CARD_STATUS.NORMAL) { switch (status.toLowerCase()) { case 'reporting': + case 'incidenthappened': case 'incident happened': case 'incident occurred': return E_CARD_STATUS.INCIDENT From 571133a5a4618f4763e22b770d23c9ca575b99e8 Mon Sep 17 00:00:00 2001 From: flashburst <82953782+flashburst@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:10:27 +0530 Subject: [PATCH 4/6] Fixed protection value in consensus table --- src/modules/insights/Consensus.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/insights/Consensus.jsx b/src/modules/insights/Consensus.jsx index 5bedad3b1..a3dc7cbed 100644 --- a/src/modules/insights/Consensus.jsx +++ b/src/modules/insights/Consensus.jsx @@ -23,9 +23,10 @@ import { import { formatCurrency } from '@/utils/formatter/currency' import { t } from '@lingui/macro' import { useLingui } from '@lingui/react' +import { convertFromUnits } from '@/utils/bn' const renderStatus = (row) => { - const status = identifyStatus(row.status) + const status = identifyStatus(row.coverOrProductData.productStatusEnum) return ( @@ -113,9 +114,9 @@ const renderCover = (row, _extraData) => { ) } -const renderProtection = (row, { locale }) => { +const renderProtection = (row, { locale, liquidityTokenDecimals }) => { const protection = formatCurrency( - row.coverOrProductData.commitment.toString(), + convertFromUnits(row.coverOrProductData.commitment.toString(), liquidityTokenDecimals), locale ) From 26b11207d9e17ba585712965e7c7567f14850a51 Mon Sep 17 00:00:00 2001 From: flashburst <82953782+flashburst@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:56:54 +0530 Subject: [PATCH 5/6] Fixed claim transaction cxToken amount #1208 --- src/modules/my-policies/MyPoliciesTxsTable.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/my-policies/MyPoliciesTxsTable.jsx b/src/modules/my-policies/MyPoliciesTxsTable.jsx index 355c4e846..aa0f8d36e 100644 --- a/src/modules/my-policies/MyPoliciesTxsTable.jsx +++ b/src/modules/my-policies/MyPoliciesTxsTable.jsx @@ -211,7 +211,7 @@ const CxTokenAmountRenderer = ({ row }) => { const tokenAmountWithSymbol = row.txType === ROW_TYPES.COVER_PURCHASED ? - : + : return ( From f728fad390b5522e04811abc4bd23e69f8a4fb83 Mon Sep 17 00:00:00 2001 From: flashburst <82953782+flashburst@users.noreply.github.com> Date: Sat, 22 Jun 2024 17:48:02 +0530 Subject: [PATCH 6/6] Updated latest snapshot proposal data --- src/config/constants.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/config/constants.js b/src/config/constants.js index 53dba1b59..92e335693 100644 --- a/src/config/constants.js +++ b/src/config/constants.js @@ -160,8 +160,8 @@ export const POLICY_POINTS_PER_DOLLAR = 0.00625 export const EMISSION_ROUNDING_MODE = BigNumber.ROUND_FLOOR export const latestSnapshotIpfsData = { - hash: 'QmaNVByqbYqP4aYXJrmUyprHzX9MVbk69yZTgcL3kSCDLB', - epochId: 2, + hash: 'QmNnwpnHzKbkZJ6gCR5zfrvdE2T2CYuYc7vDFoLbCaeR2T', + epochId: 3, networkType: 'mainnet', pools: [ { @@ -176,8 +176,6 @@ export const latestSnapshotIpfsData = { } ], emission: '375000000000000000000000', - votingStartsAt: '2024-05-16T18:30:00.000Z', - votingEndsAt: '2024-05-23T18:30:00.000Z', - epochStartsAfter: '2024-05-28T00:00:00.000Z', - epochEndsAt: '2024-06-27T23:59:59.000Z' + epochStartsAfter: '2024-06-28T00:00:00.000Z', + epochEndsAt: '2024-07-27T23:59:59.999Z' }