diff --git a/src/components/Consumption/ConsumptionView.tsx b/src/components/Consumption/ConsumptionView.tsx index a8814841b243bf68e64750d6e93248e144fba0fc..542d52d63e4cc56becea50ffcab082694b9f76bf 100644 --- a/src/components/Consumption/ConsumptionView.tsx +++ b/src/components/Consumption/ConsumptionView.tsx @@ -262,7 +262,6 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => { {!isMulti && ( <div className="konnector-section"> <KonnectorViewerCard - fluidStatus={fluidStatus[fluidType]} fluidType={fluidType} isParam={true} isDisconnected={false} @@ -281,7 +280,6 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => { <KonnectorViewerList /> ) : ( <KonnectorViewerCard - fluidStatus={fluidStatus[fluidType]} fluidType={fluidType} isParam={false} isDisconnected={true} diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx index 19b1cb27e4f848b865bfc24d83be3246cfb195e6..dc5a9150408c0a386fa90df99e5bf0785a9bb91a 100644 --- a/src/components/Konnector/KonnectorViewerCard.tsx +++ b/src/components/Konnector/KonnectorViewerCard.tsx @@ -33,6 +33,7 @@ import { UserChallengeState, UserDuelState, } from 'enums' +import { cloneDeep } from 'lodash' import { DateTime } from 'luxon' import { Account, @@ -66,7 +67,6 @@ import { getKonnectorSlug } from 'utils/utils' import './konnectorViewerCard.scss' interface KonnectorViewerCardProps { - fluidStatus: FluidStatus isParam: boolean isDisconnected: boolean showOfflineData: boolean @@ -76,7 +76,6 @@ interface KonnectorViewerCardProps { } const KonnectorViewerCard = ({ - fluidStatus, isParam, isDisconnected, showOfflineData, @@ -88,16 +87,16 @@ const KonnectorViewerCard = ({ const client = useClient() const dispatch = useAppDispatch() const navigate = useNavigate() - + const { + challenge: { currentChallenge }, + global: { fluidStatus: statusArray, shouldRefreshConsent, partnersInfo }, + } = useAppSelector(state => state.ecolyo) + const fluidStatus = statusArray[fluidType] const fluidSlug = fluidStatus.connection.konnectorConfig.slug const fluidState = fluidStatus.status const konnector: Konnector | null = fluidStatus.connection.konnector const account: Account | null = fluidStatus.connection.account const trigger: Trigger | null = fluidStatus.connection.trigger - const { - challenge: { currentChallenge }, - global: { fluidStatus: statusArray, shouldRefreshConsent, partnersInfo }, - } = useAppSelector(state => state.ecolyo) const [openModal, setOpenModal] = useState(false) const [isUpdating, setIsUpdating] = useState(false) @@ -476,9 +475,14 @@ const KonnectorViewerCard = ({ if (subscribed) { if (fluidStatus.connection.isUpdating) setIsUpdating(true) setOpenModal(true) - fluidStatus.connection.shouldLaunchKonnector = false + const updatedFluidStatus = cloneDeep(statusArray) + updatedFluidStatus[fluidType].connection.shouldLaunchKonnector = false + dispatch(setFluidStatus(updatedFluidStatus)) + // fluidStatus.connection.shouldLaunchKonnector = false } - + console.log(client) + console.log(trigger) + console.log(konnector) const connectionFlow = new ConnectionFlow(client, trigger, konnector) await connectionFlow.launch() connectionFlow.jobWatcher.on(ERROR_EVENT, () => {