Skip to content

Desktop Client: Prevent overwrite of local file cache with default values #163

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

Merged
merged 1 commit into from
May 30, 2024
Merged

Desktop Client: Prevent overwrite of local file cache with default values #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {AiOutlineInfoCircle} from "react-icons/ai";
export function WhitelistDrawer() {
const setDrawerState = useSetAtom(drawerStateAtom);
const {owners, pools} = useAtomValue(chainStateAtom);
const {data, setData} = useStorage();
const {data} = useStorage();
const [selected, setSelected] = useState<string[]>([]);
const {sentryRunning, stopRuntime} = useOperatorRuntime();
const {publicKey: operatorAddress} = useOperator();
Expand Down Expand Up @@ -82,14 +82,14 @@ export function WhitelistDrawer() {
);

async function handleSubmit() {
await setData({
...data,
whitelistedWallets: selected,
});

setDrawerState(null);

if (stopRuntime) {
void stopRuntime();
void stopRuntime({
...data,
sentryRunning: false,
whitelistedWallets: selected,
});
}
}

Expand Down
10 changes: 7 additions & 3 deletions apps/sentry-client-desktop/src/hooks/useOperatorRuntime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {Challenge, NodeLicenseInformation, NodeLicenseStatusMap, operatorRuntime
import {useOperator} from "@/features/operator";
import {atom, useAtom} from "jotai";
import {useEffect, useRef, useState} from "react";
import {useStorage} from "@/features/storage";
import {IData, useStorage} from "@/features/storage";
import log from "electron-log";
import { ethers } from "ethers";

Expand Down Expand Up @@ -70,7 +70,7 @@ export function useOperatorRuntime() {
}
}

async function stopRuntime() {
async function stopRuntime(passedData?: IData) {
if (sentryRunning && stop !== undefined) {
// prevent race conditions from pressing "stop" too fast
const _stop = stop;
Expand All @@ -79,7 +79,11 @@ export function useOperatorRuntime() {
await _stop();
setNodeLicenseStatusMap(new Map<bigint, NodeLicenseInformation>());
setSentryRunning(false);
await setData({...data, sentryRunning: false});
if (passedData) {
await setData(passedData);
} else {
await setData({...data, sentryRunning: false});
}
}
}

Expand Down