Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix refinance target protocol selection and flow issues #4036

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Fix refinance target protocol selection and flow issues #4036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8bc93d
Fixed default maker refinance target protocol selection
piotrwitek Sep 26, 2024
616961c
Fixed refinance flow & refacor for visibility
piotrwitek Sep 27, 2024
d870157
Merge commit '2cc96cc37a6bdd9789f9bf02d542b8d01562e0ce' into pw/fix-r…
piotrwitek Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions features/refinance/components/steps/RefinanceProductTableStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,7 @@ export const RefinanceProductTableStep = () => {
perPage={refinanceProductHubItemsPerPage}
hiddenBanners
initialFilters={{
protocol: [
lendingProtocol === LendingProtocol.SparkV3
? LendingProtocol.AaveV3
: LendingProtocol.SparkV3,
],
protocol: lendingProtocol === LendingProtocol.SparkV3 ? [LendingProtocol.AaveV3] : [],
network: [network.name],
}}
hiddenColumns={refinanceProductHubHiddenColumns}
Expand Down
2 changes: 1 addition & 1 deletion features/refinance/helpers/getRefinanceSidebarButtonStatus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export function getRefinanceSidebarButtonsStatus({
(isSimulationLoading || isTxInProgress || isTxWaitingForApproval)

const isPrimaryButtonHidden =
!!(walletAddress && !isOwner) ||
(walletAddress && !isOwner) ||
safetySwitch ||
[RefinanceSidebarStep.Option, RefinanceSidebarStep.Strategy].includes(currentStep)

Expand Down
29 changes: 9 additions & 20 deletions features/refinance/hooks/useSdkTransaction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,10 @@ export function useSdkRefinanceTransaction({
const [txRefinance, setTxRefinance] = useState<null | Order>(null)

const {
environment: {
slippage,
chainInfo,
marketPrices: { ethPrice },
address,
},
position: { positionId, collateralTokenData, debtTokenData, positionType, lendingProtocol },
poolData: { poolId },
environment: { chainInfo, address },
position: { lendingProtocol },
form: {
state: { strategy, dpm },
state: { dpm },
},
steps: { currentStep },
} = useRefinanceContext()
Expand All @@ -43,7 +37,11 @@ export function useSdkRefinanceTransaction({
}, [currentStep])

useEffect(() => {
if (!strategy || !dpm?.address || refinanceSimulation == null) {
if (
!dpm?.address ||
refinanceSimulation == null ||
(lendingProtocol === LendingProtocol.Maker && importPositionSimulation == null)
) {
return
}
const fetchData = async () => {
Expand Down Expand Up @@ -87,18 +85,9 @@ export function useSdkRefinanceTransaction({
}, [
sdk,
dpm?.address,
slippage,
ethPrice,
address,
chainInfo,
poolId,
positionId,
JSON.stringify(collateralTokenData),
JSON.stringify(debtTokenData),
positionType,
strategy?.product,
strategy?.primaryToken,
strategy?.secondaryToken,
lendingProtocol,
JSON.stringify(importPositionSimulation),
JSON.stringify(refinanceSimulation),
])
Expand Down
18 changes: 10 additions & 8 deletions features/refinance/views/RefinanceFormView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,19 @@ export const RefinanceFormView: FC = ({ children }) => {
txDetails,
})

const primaryButton = {
label: t(primaryButtonLabel),
disabled: isPrimaryButtonDisabled,
isLoading: isPrimaryButtonLoading,
hidden: isPrimaryButtonHidden,
withoutNextLink: true,
...primaryButtonActions,
}

const sidebarSectionProps: SidebarSectionProps = {
title: sidebarTitle,
content: <Grid gap={3}>{children}</Grid>,
primaryButton: {
label: t(primaryButtonLabel),
disabled: isPrimaryButtonDisabled,
isLoading: isPrimaryButtonLoading,
hidden: isPrimaryButtonHidden,
withoutNextLink: true,
...primaryButtonActions,
},
primaryButton,
status,
withMobilePanel: false,
disableMaxHeight: currentStep === RefinanceSidebarStep.Strategy,
Expand Down
Loading