Skip to content

Commit 145381f

Browse files
authored
Refactor automation handling in portfolio positions (#3513)
1 parent e7c52d2 commit 145381f

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

handlers/portfolio/constants.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ export const emptyAutomations = {
33
autoBuy: { enabled: false },
44
autoSell: { enabled: false },
55
stopLoss: { enabled: false },
6-
takeProfit: { enabled: false },
76
}

handlers/portfolio/positions/handlers/aave-like/helpers.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,14 @@ export const commonDataMapper = ({
127127
}[dpm.protocol]
128128
}/${dpm.vaultId}`,
129129
automations: {
130-
...(dpm.positionType !== OmniProductType.Earn && automations
130+
...(dpm.positionType !== OmniProductType.Earn
131131
? {
132132
...getPositionsAutomations({
133-
triggers: [automations.triggers],
133+
triggers: automations ? [automations.triggers] : [],
134+
defaultList: dpm.protocol !== 'AAVE' ? emptyAutomations : {},
134135
}),
135136
}
136-
: emptyAutomations),
137+
: {}),
137138
},
138139
},
139140
primaryTokenPrice: primaryTokenOraclePrice || primaryTokenTickerPrice,

handlers/portfolio/positions/helpers/getAutomationData.ts

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const automationQuery = gql`
1212
executedBlock
1313
removedBlock
1414
triggerData
15+
triggerType
1516
owner
1617
}
1718
}

handlers/portfolio/positions/helpers/getPositionsAutomations.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { TriggerType } from '@oasisdex/automation'
2-
import { emptyAutomations } from 'handlers/portfolio/constants'
32
import type { MakerDiscoverPositionsTrigger } from 'handlers/portfolio/positions/handlers/maker/types'
43
import type { PortfolioPositionAutomations } from 'handlers/portfolio/types'
54

6-
interface getPositionsAutomationsParams {
5+
interface GetPositionsAutomationsParams {
76
triggers: MakerDiscoverPositionsTrigger[]
7+
defaultList?: Record<string, boolean> | {}
88
}
99

1010
const triggerTypesMap = {
@@ -41,7 +41,8 @@ const triggerTypesMap = {
4141

4242
export function getPositionsAutomations({
4343
triggers,
44-
}: getPositionsAutomationsParams): PortfolioPositionAutomations {
44+
defaultList = {},
45+
}: GetPositionsAutomationsParams): PortfolioPositionAutomations {
4546
return triggers
4647
.filter(({ executedBlock, removedBlock }) => executedBlock === null && removedBlock === null)
4748
.reduce((automations, { triggerType }) => {
@@ -59,5 +60,5 @@ export function getPositionsAutomations({
5960
{},
6061
),
6162
}
62-
}, emptyAutomations)
63+
}, defaultList)
6364
}

0 commit comments

Comments
 (0)