Merge branch 'main' into next

OriginProtocol · Aug 11, 2024 · 5cb7a12 · 5cb7a12
2 parents 821fcf1 + a02d3db
commit 5cb7a12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/apps/defi/src/components/Topnav/components/AlertPopover.tsx b/apps/defi/src/components/Topnav/components/AlertPopover.tsx
@@ -2,7 +2,7 @@ import { Divider, IconButton, Stack, Typography } from '@mui/material';
 import { useTxButton } from '@origin/defi/shared';
 import { ClickAwayPopover, TokenIcon } from '@origin/shared/components';
 import { tokens } from '@origin/shared/contracts';
-import { FaXmarkRegular, PoweredBySafe } from '@origin/shared/icons';
+import { FaXmarkRegular } from '@origin/shared/icons';
 import { TxButton } from '@origin/shared/providers';
 import { useIntl } from 'react-intl';
 
@@ -46,7 +46,6 @@ export const AlertPopover = (
         >
           <FaXmarkRegular sx={{ fontSize: 16 }} />
         </IconButton>
-        <PoweredBySafe sx={{ width: 1, height: 24, color: 'text.primary' }} />
         <Typography>
           {intl.formatMessage({
             defaultMessage:

diff --git a/libs/defi/ogn/src/staking/components/ExtendAddLockupModal.tsx b/libs/defi/ogn/src/staking/components/ExtendAddLockupModal.tsx
@@ -128,7 +128,7 @@ export const ExtendAddLockupModal = ({
       contract: tokens.mainnet.xOGN,
       functionName: 'stake',
       args: [
-        totalAmount[0],
+        amountToAdd[0],
         durationSeconds,
         address ?? ZERO_ADDRESS,
         addRewards,