Skip to content

Commit 436da4d

Browse files
FiboApeFiboApe
authored
Sunset balmy (#1384)
* feat(*): sunset * fixup! feat(*): sunset * fixup! fixup! feat(*): sunset * fixup! fixup! fixup! feat(*): sunset
1 parent f2eee43 commit 436da4d

15 files changed

Lines changed: 123 additions & 86 deletions

File tree

‎apps/root/src/common/components/modify-settings-modal/index.tsx‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ import useDcaAllowanceTarget from '@hooks/useDcaAllowanceTarget';
6969
import { abs } from '@common/utils/bigint';
7070
import ChangesSummary from './components/changes-summary';
7171
import { AddPositionToCalendarButton } from '../add-position-to-calendar';
72-
import { Chains } from '@balmy/sdk';
7372

7473
const StyledSummaryContainer = styled.div`
7574
display: flex;
@@ -584,7 +583,6 @@ const ModifySettingsModal = ({ position, open, onCancel }: ModifySettingsModalPr
584583

585584
const minimumTokensNeeded = usdPriceToToken(from, minimumToUse, usdPrice);
586585

587-
const shouldDisableIncrease = position.chainId === Chains.ROOTSTOCK.chainId;
588586
let actions: {
589587
label: React.ReactNode;
590588
onClick: () => void;
@@ -609,7 +607,7 @@ const ModifySettingsModal = ({ position, open, onCancel }: ModifySettingsModalPr
609607
/>
610608
),
611609
onClick: () => handleApproveToken(),
612-
disabled: !!hasPendingApproval || shouldDisableByUsd || shouldDisableIncrease,
610+
disabled: !!hasPendingApproval || shouldDisableByUsd || isIncreasingPosition,
613611
options: [
614612
{
615613
text: (
@@ -627,7 +625,7 @@ const ModifySettingsModal = ({ position, open, onCancel }: ModifySettingsModalPr
627625
}}
628626
/>
629627
),
630-
disabled: !!hasPendingApproval || shouldDisableByUsd || shouldDisableIncrease,
628+
disabled: !!hasPendingApproval || shouldDisableByUsd || isIncreasingPosition,
631629
onClick: () => handleApproveToken(true),
632630
},
633631
],
@@ -668,7 +666,7 @@ const ModifySettingsModal = ({ position, open, onCancel }: ModifySettingsModalPr
668666
variant: 'contained',
669667
label: <FormattedMessage description="modifyPositionPermit2" defaultMessage="Authorize and modify position" />,
670668
onClick: handleModifyRateAndSwaps,
671-
disabled: !!cantFund || frequencyValue === '0' || shouldDisableByUsd || shouldDisableIncrease,
669+
disabled: !!cantFund || frequencyValue === '0' || shouldDisableByUsd || isIncreasingPosition,
672670
},
673671
];
674672
}
@@ -680,8 +678,7 @@ const ModifySettingsModal = ({ position, open, onCancel }: ModifySettingsModalPr
680678
variant: 'contained',
681679
label: <FormattedMessage description="modifyPosition" defaultMessage="Modify position" />,
682680
onClick: handleModifyRateAndSwaps,
683-
disabled:
684-
!!cantFund || frequencyValue === '0' || shouldDisableByUsd || (isIncreasingPosition && shouldDisableIncrease),
681+
disabled: !!cantFund || frequencyValue === '0' || shouldDisableByUsd || isIncreasingPosition,
685682
},
686683
];
687684
}
@@ -693,8 +690,7 @@ const ModifySettingsModal = ({ position, open, onCancel }: ModifySettingsModalPr
693690
variant: 'contained',
694691
label: <FormattedMessage description="modifyPositionSafe" defaultMessage="Authorize and modify position" />,
695692
onClick: handleModifyRateAndSwapsSafe,
696-
disabled:
697-
!!cantFund || frequencyValue === '0' || shouldDisableByUsd || (isIncreasingPosition && shouldDisableIncrease),
693+
disabled: !!cantFund || frequencyValue === '0' || shouldDisableByUsd || isIncreasingPosition,
698694
},
699695
];
700696
}
@@ -706,8 +702,7 @@ const ModifySettingsModal = ({ position, open, onCancel }: ModifySettingsModalPr
706702
variant: 'contained',
707703
label: <FormattedMessage description="modifyPosition" defaultMessage="Modify position" />,
708704
onClick: handleModifyRateAndSwapsSafe,
709-
disabled:
710-
!!cantFund || frequencyValue === '0' || shouldDisableByUsd || (isIncreasingPosition && shouldDisableIncrease),
705+
disabled: !!cantFund || frequencyValue === '0' || shouldDisableByUsd || isIncreasingPosition,
711706
},
712707
];
713708
}

‎apps/root/src/frame/components/navigation/index.tsx‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import usePushToHistory from '@hooks/usePushToHistory';
1414
import { changeRoute } from '@state/tabs/actions';
1515
import { useRoute } from '@state/tabs/hooks';
1616
import React, { useCallback } from 'react';
17-
import { defineMessage, useIntl } from 'react-intl';
17+
import { defineMessage, FormattedMessage, useIntl } from 'react-intl';
1818
import {
1919
Switch,
2020
Navigation as NavigationUI,
@@ -34,6 +34,9 @@ import {
3434
TrashIcon,
3535
MovingStarIcon,
3636
DollarSquareIcon,
37+
Link,
38+
Typography,
39+
colors,
3740
} from 'ui-library';
3841
// import { setSwitchActiveWalletOnConnectionThunk, toggleTheme } from '@state/config/actions';
3942
// import { useSwitchActiveWalletOnConnection, useThemeMode } from '@state/config/hooks';
@@ -287,11 +290,34 @@ const Navigation = ({ children }: React.PropsWithChildren) => {
287290
]
288291
: [];
289292

293+
const SunsetMessage = () => (
294+
<Typography variant="bodySmallRegular" color={colors[mode].typography.white}>
295+
<FormattedMessage
296+
description="balmy_sunset"
297+
defaultMessage="We've made the difficult decision to begin sunsetting Balmy. Starting today, deposits and increases for recurring investments, as well as earn vaults, are paused. You can read more about this decision and how it will affect you and your open positions "
298+
/>
299+
<Link
300+
href="https://balmy.medium.com/sovereignt-bank-unwinding-balmy-24f2405062ff"
301+
target="_blank"
302+
sx={{
303+
display: 'inline-flex',
304+
margin: ({ spacing }) => `0px ${spacing(1)}`,
305+
color: colors[mode].typography.white,
306+
textDecorationColor: colors[mode].typography.white,
307+
}}
308+
>
309+
<FormattedMessage description="here" defaultMessage="here." />
310+
</Link>
311+
</Typography>
312+
);
313+
290314
return (
291315
<>
292316
<LevelUpModal />
293317
<NavigationUI
294318
extraHeaderTools={<TierPills />}
319+
warning={<SunsetMessage />}
320+
warningLevel="error"
295321
headerContent={
296322
<NetWorth
297323
variant={NetWorthVariants.nav}

‎apps/root/src/hooks/useIsSomeWalletIndexed.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
import React from 'react';
22
import useStoredTransactionHistory from './useStoredTransactionHistory';
33
import { Address } from 'viem';
4-
import { IndexerUnits } from 'common-types';
5-
import { UnitsIndexedByChainPercentage, IncludedIndexerUnits } from '@common/utils/transaction-history';
4+
import { ChainId, IndexerUnits } from 'common-types';
65

76
const INDEXER_ACCEPTANCE = 0.95; // 95%
87

98
const EMPTY_INDEXER_UNITS = {
109
[IndexerUnits.DCA]: {},
1110
[IndexerUnits.AGG_SWAPS]: {},
12-
[IndexerUnits.ERC20_APPROVALS]: {},
13-
[IndexerUnits.ERC20_TRANSFERS]: {},
14-
[IndexerUnits.NATIVE_TRANSFERS]: {},
1511
[IndexerUnits.EARN]: {},
1612
};
1713

14+
type IncludedIndexerUnits = Exclude<
15+
IndexerUnits,
16+
| IndexerUnits.CHAINLINK_REGISTRY
17+
| IndexerUnits.NATIVE_TRANSFERS
18+
| IndexerUnits.ERC20_APPROVALS
19+
| IndexerUnits.ERC20_TRANSFERS
20+
>;
21+
22+
export type UnitsIndexedByChainPercentage = Record<
23+
Address,
24+
Record<IncludedIndexerUnits, Record<ChainId, { percentage: number; isIndexed: boolean }>>
25+
>; // <IndexerUnits, Record<ChainId, boolean>>
26+
1827
export const IncludedIndexerUnitsArrayTypes: IncludedIndexerUnits[] = [
1928
IndexerUnits.DCA,
2029
IndexerUnits.AGG_SWAPS,
21-
IndexerUnits.ERC20_APPROVALS,
22-
IndexerUnits.ERC20_TRANSFERS,
2330
IndexerUnits.EARN,
24-
IndexerUnits.NATIVE_TRANSFERS,
2531
] as const;
2632

2733
export default function useIsSomeWalletIndexed(wallet?: Address) {

‎apps/root/src/pages/dca/create-position/components/dca-button/index.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,15 @@ const DcaButton = ({
9999
const swapsIsMax = BigInt(frequencyValue || '0') > maxUint32;
100100

101101
const shouldDisableApproveButton =
102+
true ||
102103
!from ||
103104
!to ||
104105
!fromValue ||
105106
!frequencyValue ||
106107
cantFund ||
107108
!balance ||
108109
allowanceErrors ||
109-
parseUnits(fromValue, from.decimals) <= 0 ||
110+
parseUnits(fromValue, from?.decimals || 0) <= 0 ||
110111
BigInt(frequencyValue) <= 0 ||
111112
(shouldEnableYield && fromCanHaveYield && isUndefined(fromYield)) ||
112113
(shouldEnableYield && toCanHaveYield && isUndefined(toYield));

‎apps/root/src/pages/dca/positions/components/positions-list/current-positions/components/position-card-button/index.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ const PositionCardButton = ({
107107
const fromHasYield = !!position.from.underlyingTokens.length;
108108
const toHasYield = !!position.to.underlyingTokens.length;
109109

110-
const canAddFunds = VERSIONS_ALLOWED_MODIFY.includes(position.version);
110+
const canAddFunds = false && VERSIONS_ALLOWED_MODIFY.includes(position.version);
111111

112112
const disabledIncrease =
113+
true ||
113114
disabled ||
114115
!dcaTokens[`${chainId}-${position.from.address.toLowerCase()}` as TokenListId] ||
115116
!dcaTokens[`${chainId}-${position.to.address.toLowerCase()}` as TokenListId] ||

‎apps/root/src/pages/earn/components/strategies-display-wrapper/index.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ interface StrategiesTableProps<T extends StrategiesTableVariants> {
2424
withPagination?: boolean;
2525
showBalances?: boolean;
2626
farmsWithDepositableTokens?: FarmsWithAvailableDepositTokens;
27-
handleMigrationModalOpen?: () => void;
2827
}
2928

3029
const StrategiesDisplayWrapper = <T extends StrategiesTableVariants>({
@@ -35,7 +34,6 @@ const StrategiesDisplayWrapper = <T extends StrategiesTableVariants>({
3534
withPagination,
3635
showBalances = true,
3736
farmsWithDepositableTokens,
38-
handleMigrationModalOpen,
3937
}: StrategiesTableProps<T>) => {
4038
const [page, setPage] = React.useState(0);
4139
const pushToHistory = usePushToHistory();
@@ -74,7 +72,6 @@ const StrategiesDisplayWrapper = <T extends StrategiesTableVariants>({
7472
variant={variant}
7573
setPage={setPage}
7674
farmsWithDepositableTokens={farmsWithDepositableTokens}
77-
handleMigrationModalOpen={handleMigrationModalOpen}
7875
/>
7976
{shouldShowMobileList ? (
8077
<StrategiesList

‎apps/root/src/pages/earn/components/strategies-table/components/toolbar/all-strategies-heading/index.tsx‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,34 @@
11
import React, { useState } from 'react';
22
import { FormattedMessage } from 'react-intl';
33
import { Button, colors, ContainerBox, NotificationIcon, Typography } from 'ui-library';
4-
import styled from 'styled-components';
5-
import { FarmsWithAvailableDepositTokens } from '@hooks/earn/useAvailableDepositTokens';
6-
import useAnalytics from '@hooks/useAnalytics';
4+
// import styled from 'styled-components';
5+
// import { FarmsWithAvailableDepositTokens } from '@hooks/earn/useAvailableDepositTokens';
6+
// import useAnalytics from '@hooks/useAnalytics';
77
import NotifyEmailModal from './notify-email-modal';
8-
const StyledMigrationAmount = styled(ContainerBox).attrs({
9-
alignItems: 'center',
10-
justifyContent: 'center',
11-
})`
12-
${({ theme: { palette, spacing } }) => `
13-
background-color: ${colors[palette.mode].accentPrimary};
14-
border-radius: 100px;
15-
width: ${spacing(4.5)};
16-
height: ${spacing(4.5)};
17-
`}
18-
`;
8+
// const StyledMigrationAmount = styled(ContainerBox).attrs({
9+
// alignItems: 'center',
10+
// justifyContent: 'center',
11+
// })`
12+
// ${({ theme: { palette, spacing } }) => `
13+
// background-color: ${colors[palette.mode].accentPrimary};
14+
// border-radius: 100px;
15+
// width: ${spacing(4.5)};
16+
// height: ${spacing(4.5)};
17+
// `}
18+
// `;
1919

20-
const AllStrategiesHeading = ({
21-
farmsWithDepositableTokens = [],
22-
handleMigrationModalOpen,
23-
}: {
24-
farmsWithDepositableTokens?: FarmsWithAvailableDepositTokens;
25-
handleMigrationModalOpen?: () => void;
26-
}) => {
27-
const { trackEvent } = useAnalytics();
20+
const AllStrategiesHeading = (
21+
{
22+
// farmsWithDepositableTokens = [],
23+
}: {
24+
// farmsWithDepositableTokens?: FarmsWithAvailableDepositTokens;
25+
}
26+
) => {
27+
// const { trackEvent } = useAnalytics();
2828
const [isNotifyEmailModalOpen, setIsNotifyEmailModalOpen] = useState(false);
29-
const migrableTokensAmount = farmsWithDepositableTokens?.filter(
30-
(farm) => Number(farm.balance.amountInUSD) > 1
31-
).length;
32-
33-
const onMigrationModalOpen = () => {
34-
if (!handleMigrationModalOpen) {
35-
return;
36-
}
37-
handleMigrationModalOpen();
38-
trackEvent('Earn - One click migration - Table Toolbar - Open migration modal');
39-
};
29+
// const migrableTokensAmount = farmsWithDepositableTokens?.filter(
30+
// (farm) => Number(farm.balance.amountInUSD) > 1
31+
// ).length;
4032

4133
return (
4234
<>
@@ -55,7 +47,7 @@ const AllStrategiesHeading = ({
5547
/>
5648
</ContainerBox>
5749
</Button>
58-
<Button
50+
{/* <Button
5951
variant="text"
6052
onClick={onMigrationModalOpen}
6153
sx={{ display: 'flex', gap: 1 }}
@@ -74,7 +66,7 @@ const AllStrategiesHeading = ({
7466
description="earn.all-strategies-table.migrate-investments"
7567
defaultMessage="Migrate Investments"
7668
/>
77-
</Button>
69+
</Button> */}
7870
</ContainerBox>
7971
</ContainerBox>
8072
</>

‎apps/root/src/pages/earn/components/strategies-table/components/toolbar/index.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ const AllStrategiesTableToolbar = ({
3434
variant,
3535
strategiesCount,
3636
setPage,
37-
farmsWithDepositableTokens,
38-
handleMigrationModalOpen,
37+
// farmsWithDepositableTokens,
3938
}: AllStrategiesTableToolbarProps) => {
4039
const intl = useIntl();
4140
const dispatch = useAppDispatch();
@@ -54,10 +53,7 @@ const AllStrategiesTableToolbar = ({
5453
return (
5554
<ContainerBox justifyContent="space-between" alignItems="end" flexWrap="wrap" gap={3}>
5655
{variant === StrategiesTableVariants.ALL_STRATEGIES ? (
57-
<AllStrategiesHeading
58-
farmsWithDepositableTokens={farmsWithDepositableTokens}
59-
handleMigrationModalOpen={handleMigrationModalOpen}
60-
/>
56+
<AllStrategiesHeading />
6157
) : (
6258
<ContainerBox alignItems="center" gap={2}>
6359
<Typography variant="h3Bold" color={({ palette: { mode } }) => colors[mode].typography.typo1}>

‎apps/root/src/pages/earn/home/components/all-strategies-table/index.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ const variant = StrategiesTableVariants.ALL_STRATEGIES;
1111

1212
const AllStrategiesTable = ({
1313
farmsWithDepositableTokens,
14-
handleMigrationModalOpen,
1514
}: {
1615
farmsWithDepositableTokens: FarmsWithAvailableDepositTokens;
17-
handleMigrationModalOpen: () => void;
1816
}) => {
1917
const hasFetchedAllStrategies = useHasFetchedAllStrategies();
2018
const strategies = useAllStrategiesForTable();
@@ -34,7 +32,6 @@ const AllStrategiesTable = ({
3432
isLoading={!hasFetchedAllStrategies}
3533
withPagination
3634
farmsWithDepositableTokens={farmsWithDepositableTokens}
37-
handleMigrationModalOpen={handleMigrationModalOpen}
3835
/>
3936
);
4037
};

0 commit comments

Comments
 (0)