0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into release-v1.6.54

Browse source
This commit is contained in:
Abhinav 2023-11-28 15:57:28 +05:30
commit d48dae37e7
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.husky/pre-commit
View file

@ -1,4 +1,11 @@
#!/bin/sh #!/bin/sh
. "$(dirname "$0")/_/husky.sh" . "$(dirname "$0")/_/husky.sh"
branch="$(git rev-parse --abbrev-ref HEAD)"
if [ "$branch" = "main" ]; then
echo "You can't commit directly to main branch"
exit 1
fi
npx lint-staged npx lint-staged

2
src/api/electronStore.ts
View file

@ -3,12 +3,14 @@ import { safeStorageStore } from '../stores/safeStorage.store';
import { uploadStatusStore } from '../stores/upload.store'; import { uploadStatusStore } from '../stores/upload.store';
import { logError } from '../services/logging'; import { logError } from '../services/logging';
import { userPreferencesStore } from '../stores/userPreferences.store'; import { userPreferencesStore } from '../stores/userPreferences.store';
import { watchStore } from '../stores/watch.store';
export const clearElectronStore = () => { export const clearElectronStore = () => {
try { try {
uploadStatusStore.clear(); uploadStatusStore.clear();
keysStore.clear(); keysStore.clear();
safeStorageStore.clear(); safeStorageStore.clear();
watchStore.clear();
userPreferencesStore.delete('optOutOfCrashReports'); userPreferencesStore.delete('optOutOfCrashReports');
} catch (e) { } catch (e) {
logError(e, 'error while clearing electron store'); logError(e, 'error while clearing electron store');