diff --git a/package.json b/package.json index d686fcda765..e0f7ebe2f93 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "scripts": { "start": "yarn start:browser", - "start:desktop": "npm-run-all --parallel 'start:desktop-*'", + "start:desktop": "yarn rebuild-electron && npm-run-all --parallel 'start:desktop-*'", "start:desktop-node": "yarn workspace loot-core watch:node", "start:desktop-client": "yarn workspace @actual-app/web watch", "start:desktop-electron": "yarn workspace desktop-electron watch", diff --git a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png index 097b1beda3b..1685e7e51d7 100644 Binary files a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png index d96f3ce3035..2646cc85e09 100644 Binary files a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png differ diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json index ffa3681012b..b8dc8f84238 100644 --- a/packages/desktop-client/package.json +++ b/packages/desktop-client/package.json @@ -53,6 +53,7 @@ "react-redux": "7.2.1", "react-router-dom": "6.11.2", "react-scripts": "^5.0.1", + "react-simple-pull-to-refresh": "^1.3.3", "react-spring": "^9.7.1", "react-virtualized-auto-sizer": "^1.0.2", "redux": "^4.0.5", diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx index 4483900ee80..fab82dbe3ab 100644 --- a/packages/desktop-client/src/components/Titlebar.tsx +++ b/packages/desktop-client/src/components/Titlebar.tsx @@ -9,8 +9,6 @@ import React, { import { useSelector } from 'react-redux'; import { Routes, Route, useLocation, useNavigate } from 'react-router-dom'; -import { css, media } from 'glamor'; - import * as Platform from 'loot-core/src/client/platform'; import * as queries from 'loot-core/src/client/queries'; import { listen } from 'loot-core/src/platform/client/fetch'; @@ -24,7 +22,6 @@ import SvgEyeSlashed from '../icons/v2/EyeSlashed'; import NavigationMenu from '../icons/v2/NavigationMenu'; import { useResponsive } from '../ResponsiveProvider'; import { colors, type CSSProperties } from '../style'; -import tokens from '../tokens'; import AccountSyncCheck from './accounts/AccountSyncCheck'; import AnimatedRefresh from './AnimatedRefresh'; @@ -107,8 +104,9 @@ function PrivacyButton() { type SyncButtonProps = { style?: CSSProperties; + isMobile?: boolean; }; -export function SyncButton({ style }: SyncButtonProps) { +export function SyncButton({ style, isMobile = false }: SyncButtonProps) { let cloudFileId = useSelector(state => state.prefs.local.cloudFileId); let { sync } = useActions(); @@ -156,33 +154,29 @@ export function SyncButton({ style }: SyncButtonProps) { syncState === 'local' ? colors.n9 : style.color; - const activeStyle = css( - // mobile - media(`(max-width: ${tokens.breakpoint_small})`, { - color: mobileColor, - }), - ); + const desktopColor = + syncState === 'error' + ? colors.r4 + : syncState === 'disabled' || + syncState === 'offline' || + syncState === 'local' + ? colors.n6 + : null; + + const activeStyle = isMobile + ? { + color: mobileColor, + } + : {}; return (