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

release-v0.15.4 #1917

Merged
merged 6 commits into from
Jul 13, 2023
Merged

release-v0.15.4 #1917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
194fa0c
Take out clearUserData for now
gdbroman Jul 13, 2023
4dfb5f2
Merge pull request #1915 from holium/fix-wipe
drunkplato Jul 13, 2023
d3ee029
Don't remove onMouseDown/onMouseUp in appgrid (disables scrolling)
gdbroman Jul 13, 2023
b341bf9
Merge pull request #1916 from holium/fix-realm-scroll-after-opening-app
gdbroman Jul 13, 2023
1e474ba
Convert map to foreach
gdbroman Jul 13, 2023
c8120b5
Merge pull request #1918 from holium/fix-map-to-foreach
gdbroman Jul 13, 2023
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
22 changes: 0 additions & 22 deletions app/src/main/helpers/clearUserData.ts
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions app/src/main/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { app, BrowserWindow, Menu, MenuItem, nativeImage } from 'electron';
import log from 'electron-log';
import Store from 'electron-store';

import { RealmService } from '../os/realm.service';
import { AppUpdater } from './AppUpdater';
import { clearUserData } from './helpers/clearUserData';
import { setRealmCursor } from './helpers/cursorSettings';
import { isMac, isMacWithCameraNotch } from './helpers/env';
import { windowWindow } from './helpers/fullscreen';
Expand Down Expand Up @@ -58,28 +56,6 @@ const updateMacDockMenu = (
};

export const bootRealm = () => {
const storedRealmRelease = store.get('realmRelease');
const currentRealmRelease = app.getVersion();

if (
Boolean(storedRealmRelease) &&
storedRealmRelease !== currentRealmRelease
) {
// If the stored realmRelease is different from the current realmRelease,
// it means the user has had Realm uninstalled for a while and is now
// reinstalling it, since it otherwise would have been updated by AppUpdater.
// In this case, we want to clear the user data.
log.info(
'Booting a Realm version different from stored user data:',
storedRealmRelease,
'vs.',
currentRealmRelease
);
clearUserData();
} else {
log.info('Booting a Realm version compatible with stored user data.');
}

store.set('isStandaloneChat', false);

if (!realmService) {
Expand Down
8 changes: 1 addition & 7 deletions app/src/renderer/system/desktop/components/Home/Ship/AppGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ const AppGridPresenter = ({ maxWidth }: AppGridProps) => {
window.electron.app.onMouseUp(() => {
canClick.setToggle(true);
});

return () => {
window.electron.app.removeOnMouseMove();
window.electron.app.removeOnMouseUp();
};
}, []);

if (!currentSpace) return null;
Expand All @@ -65,8 +60,7 @@ const AppGridPresenter = ({ maxWidth }: AppGridProps) => {
setItems(nextState);
const newGrid = Object();

// eslint-disable-next-line array-callback-return
nextState.map((app, index: number) => {
nextState.forEach((app, index: number) => {
newGrid[index] = app.id;
});
bazaarStore.reorderApp(sourceIndex, targetIndex, newGrid);
Expand Down