Merge branch 'next' into feat/oeth-withdrawal

OriginProtocol · Aug 1, 2024 · 52034fb · 52034fb
2 parents 5c5f83b + 08230f8
commit 52034fb
Show file tree

Hide file tree

Showing 16 changed files with 211 additions and 221 deletions.
diff --git a/.github/workflows/.gitkeep b/.github/workflows/.gitkeep
diff --git a/libs/defi/governance/src/overview/components/MyVotingPowerCard.tsx b/libs/defi/governance/src/overview/components/MyVotingPowerCard.tsx
@@ -59,7 +59,7 @@ export const MyVotingPowerCard = (props: CardProps) => {
   const votingPowerPercent = toNumber(
     div(
       [BigInt(info?.votingPower ?? 0), tokens.mainnet.xOGN.decimals],
-      [xOgnTotalSupply, tokens.mainnet.xOGN.decimals],
+      [xOgnTotalSupply ?? 1n, tokens.mainnet.xOGN.decimals],
     ),
   );
 

diff --git a/libs/defi/governance/src/overview/components/ProposalsCountCard.tsx b/libs/defi/governance/src/overview/components/ProposalsCountCard.tsx
@@ -18,11 +18,11 @@ export const ProposalsCountCard = (props: CardProps) => {
         token: tokens.mainnet.xOGN.address,
         chainId: tokens.mainnet.xOGN.chainId,
       },
-      { select: (data) => data?.erc20HoldersConnection?.totalCount },
+      { select: (data) => data?.erc20HoldersConnection?.totalCount ?? 0 },
     );
 
   const active =
-    proposals?.filter((p) =>
+    proposals?.filter?.((p) =>
       [OgvProposalState.Active.toLowerCase()].includes(p.status.toLowerCase()),
     )?.length ?? 0;
 

diff --git a/libs/defi/ogn/src/staking/components/ExtendAddLockupModal.tsx b/libs/defi/ogn/src/staking/components/ExtendAddLockupModal.tsx
@@ -313,7 +313,7 @@ export const ExtendAddLockupModal = ({
             <Typography>
               {intl.formatNumber(
                 +formatUnits(
-                  BigInt(lockup.amount),
+                  BigInt(lockup?.amount ?? 0),
                   tokens.mainnet.OGN.decimals,
                 ),
                 {
@@ -326,7 +326,7 @@ export const ExtendAddLockupModal = ({
             <Typography>
               {intl.formatNumber(
                 +formatUnits(
-                  BigInt(lockup.points) ?? 0n,
+                  BigInt(lockup?.points ?? 0),
                   tokens.mainnet.xOGN.decimals,
                 ) /
                   +formatUnits(
@@ -523,7 +523,7 @@ export const ExtendAddLockupModal = ({
                       votingPowerPercent <= 1e-6 && votingPowerPercent > 0
                         ? `~ `
                         : '',
-                    value: intl.formatNumber(votingPowerPercent, {
+                    value: intl.formatNumber(votingPowerPercent ?? 0, {
                       style: 'percent',
                       minimumFractionDigits: 2,
                       maximumFractionDigits: 5,

diff --git a/libs/defi/ogn/src/staking/components/LockupsTable.tsx b/libs/defi/ogn/src/staking/components/LockupsTable.tsx
@@ -61,7 +61,10 @@ export const LockupsTable = () => {
         header: intl.formatMessage({ defaultMessage: 'OGN' }),
         cell: (info) =>
           intl.formatNumber(
-            +formatUnits(BigInt(info.getValue()), tokens.mainnet.OGN.decimals),
+            +formatUnits(
+              BigInt(info.getValue() ?? 0),
+              tokens.mainnet.OGN.decimals,
+            ),
             {
               minimumFractionDigits: 0,
               maximumFractionDigits: 0,
@@ -95,7 +98,7 @@ export const LockupsTable = () => {
               cell: (info) =>
                 intl.formatNumber(
                   +formatUnits(
-                    BigInt(info.getValue()),
+                    BigInt(info.getValue() ?? 0),
                     tokens.mainnet.xOGN.decimals,
                   ),
                   {
@@ -116,7 +119,7 @@ export const LockupsTable = () => {
           >
             {intl.formatNumber(
               +formatUnits(
-                BigInt(info.getValue()) ?? 0n,
+                BigInt(info.getValue() ?? 0),
                 tokens.mainnet.xOGN.decimals,
               ) /
                 +formatUnits(

diff --git a/libs/defi/ogn/src/staking/components/StakeRewardModal.tsx b/libs/defi/ogn/src/staking/components/StakeRewardModal.tsx
@@ -553,7 +553,7 @@ export const StakeRewardModal = (props: DialogProps) => {
                         : '',
                     value:
                       amount > 0n
-                        ? intl.formatNumber(votingPowerPercent, {
+                        ? intl.formatNumber(votingPowerPercent ?? 0, {
                             style: 'percent',
                             minimumFractionDigits: 2,
                             maximumFractionDigits: 5,
@@ -621,7 +621,10 @@ function LockupSelect({
         header: intl.formatMessage({ defaultMessage: 'OGN' }),
         cell: (info) =>
           intl.formatNumber(
-            +formatUnits(BigInt(info.getValue()), tokens.mainnet.OGN.decimals),
+            +formatUnits(
+              BigInt(info.getValue() ?? 0),
+              tokens.mainnet.OGN.decimals,
+            ),
             {
               minimumFractionDigits: 0,
               maximumFractionDigits: 0,
@@ -643,7 +646,7 @@ function LockupSelect({
         cell: (info) =>
           intl.formatNumber(
             +formatUnits(
-              BigInt(info.getValue()) ?? 0n,
+              BigInt(info.getValue() ?? 0),
               tokens.mainnet.xOGN.decimals,
             ) /
               +formatUnits(

diff --git a/libs/defi/ogn/src/staking/components/StakingForm.tsx b/libs/defi/ogn/src/staking/components/StakingForm.tsx
@@ -412,7 +412,7 @@ export const StakingForm = () => {
                             votingPowerPercent <= 1e-6 && votingPowerPercent > 0
                               ? `~ `
                               : '',
-                          value: intl.formatNumber(votingPowerPercent, {
+                          value: intl.formatNumber(votingPowerPercent ?? 0, {
                             style: 'percent',
                             minimumFractionDigits: 2,
                             maximumFractionDigits: 5,

diff --git a/libs/defi/ogn/src/staking/components/UnstakeLockupModal.tsx b/libs/defi/ogn/src/staking/components/UnstakeLockupModal.tsx
@@ -149,7 +149,7 @@ export const UnstakeLockupModal = ({
             <Typography>
               {intl.formatNumber(
                 +formatUnits(
-                  BigInt(lockup.amount),
+                  BigInt(lockup.amount ?? 0),
                   tokens.mainnet.OGN.decimals,
                 ),
                 {
@@ -160,7 +160,7 @@ export const UnstakeLockupModal = ({
             </Typography>
             <Typography>{formatTimeRemaining(lockup.end)}</Typography>
             <LoadingLabel isLoading={isPreviewOgnLoading}>
-              {intl.formatNumber(penaltyPercent, {
+              {intl.formatNumber(penaltyPercent ?? 0, {
                 style: 'percent',
                 minimumFractionDigits: 2,
                 maximumFractionDigits: 2,

diff --git a/libs/defi/ogn/src/staking/components/VotingPowerCard.tsx b/libs/defi/ogn/src/staking/components/VotingPowerCard.tsx
@@ -123,7 +123,7 @@ export const VotingPowerCard = (props: CardProps) => {
                 defaultMessage: '{tilt}{value}',
               },
               {
-                value: intl.formatNumber(percent, {
+                value: intl.formatNumber(percent ?? 0, {
                   style: 'percent',
                   minimumFractionDigits: 2,
                   maximumFractionDigits: 5,

diff --git a/libs/defi/ogv/src/migration/components/ConvertModal.tsx b/libs/defi/ogv/src/migration/components/ConvertModal.tsx
@@ -250,7 +250,7 @@ export const ConvertModal = ({
               >
                 <Collapse orientation="horizontal" in={!ratioOpen}>
                   <Typography mr={0.75}>
-                    {intl.formatNumber(stakingRatio / 100, {
+                    {intl.formatNumber((stakingRatio ?? 0) / 100, {
                       style: 'percent',
                     })}
                   </Typography>
@@ -267,7 +267,9 @@ export const ConvertModal = ({
                   fontWeight="bold"
                   color="primary.main"
                 >
-                  {intl.formatNumber(stakingRatio / 100, { style: 'percent' })}
+                  {intl.formatNumber((stakingRatio ?? 0) / 100, {
+                    style: 'percent',
+                  })}
                 </Typography>
                 <Slider
                   value={stakingRatio}

diff --git a/libs/defi/ogv/src/migration/components/MigrationForm.tsx b/libs/defi/ogv/src/migration/components/MigrationForm.tsx
@@ -363,7 +363,7 @@ function SummaryCard({ ogv, convertProps, ...rest }: SummaryCardProps) {
   const intl = useIntl();
 
   const converted =
-    +formatUnits(ogv, tokens.mainnet.OGV.decimals) * ogvToOgnRate;
+    +formatUnits(ogv ?? 0n, tokens.mainnet.OGV.decimals) * ogvToOgnRate;
 
   return (
     <Card {...rest}>
@@ -379,7 +379,9 @@ function SummaryCard({ ogv, convertProps, ...rest }: SummaryCardProps) {
           spacing={1}
         >
           <Typography variant="featured2" fontWeight="bold">
-            {intl.formatNumber(+formatUnits(ogv, tokens.mainnet.OGV.decimals))}
+            {intl.formatNumber(
+              +formatUnits(ogv ?? 0n, tokens.mainnet.OGV.decimals),
+            )}
           </Typography>
           <TokenChip
             token={tokens.mainnet.OGV}

diff --git a/libs/defi/shared/src/components/TokenInput/index.tsx b/libs/defi/shared/src/components/TokenInput/index.tsx
@@ -106,7 +106,7 @@ export const TokenInput = forwardRef<HTMLInputElement, TokenInputProps>(
               flexGrow={1}
               color={amount === 0n ? 'text.secondary' : 'text.primary'}
             >
-              {intl.formatNumber(+formatUnits(amount, decimals), {
+              {intl.formatNumber(+formatUnits(amount ?? 0n, decimals), {
                 roundingMode: 'floor',
                 minimumFractionDigits: 0,
                 maximumFractionDigits: 8,

diff --git a/libs/shared/providers/src/intl/hooks.ts b/libs/shared/providers/src/intl/hooks.ts
@@ -28,7 +28,7 @@ export const useFormat = () => {
       zeroPlaceholder = '0.00',
       options?: FormatNumberOptions,
     ) => {
-      if (!amount || amount === 0n) return zeroPlaceholder;
+      if (!amount || amount === 0n || amount === 0) return zeroPlaceholder;
 
       const amt =
         typeof amount === 'bigint' ? +formatUnits(amount, decimals) : amount;
@@ -55,7 +55,7 @@ export const useFormat = () => {
       zeroPlaceholder = '0.00',
       options?: FormatNumberOptions,
     ) => {
-      if (!amount || amount === 0n) return zeroPlaceholder;
+      if (!amount || amount === 0n || amount === 0) return zeroPlaceholder;
 
       const amt =
         typeof amount === 'bigint' ? +formatUnits(amount, decimals) : amount;
@@ -76,7 +76,7 @@ export const useFormat = () => {
       zeroPlaceholder = '$0.00',
       options?: FormatNumberOptions,
     ) => {
-      if (!amount || amount === 0n) return zeroPlaceholder;
+      if (!amount || amount === 0n || amount === 0) return zeroPlaceholder;
 
       const amt =
         typeof amount === 'bigint' ? +formatUnits(amount, decimals) : amount;
@@ -100,7 +100,7 @@ export const useFormat = () => {
       zeroPlaceholder = '0.00',
       options?: FormatNumberOptions,
     ) => {
-      if (!amount || amount === 0n) return zeroPlaceholder;
+      if (!amount || amount === 0n || amount === 0) return zeroPlaceholder;
 
       const amt =
         typeof amount === 'bigint' ? +formatUnits(amount, decimals) : amount;

diff --git a/libs/shared/providers/src/wagmi/components/BalanceList.tsx b/libs/shared/providers/src/wagmi/components/BalanceList.tsx
@@ -51,7 +51,7 @@ function BalanceRow({
         {isBalanceLoading ? (
           <Skeleton width={38} />
         ) : (
-          intl.formatNumber(balance, {
+          intl.formatNumber(balance ?? 0, {
             minimumFractionDigits: 4,
             maximumFractionDigits: 4,
           })

diff --git a/package.json b/package.json
@@ -105,9 +105,5 @@
     "vite-plugin-static-copy": "^1.0.6",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "~4.3.1"
-  },
-  "engines": {
-    "node": "20",
-    "npm": "9"
   }
 }