Skip to content

A local-first personal finance app

Merge branch 'master' into config-server-polish

Tom French6b1a9869ecfc
diff --cc packages/desktop-client/src/components/LoggedInUser.js
index e90b253b65,c02a23c06a..1e897ca379
--- a/packages/desktop-client/src/components/LoggedInUser.js
+++ b/packages/desktop-client/src/components/LoggedInUser.js
@@@ -1,6 -1,7 +1,7 @@@
import React, { useState, useEffect } from 'react';
import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
+import { useHistory, withRouter } from 'react-router';
+
import * as actions from 'loot-core/src/client/actions';
import {
View,
@@@ -10,9 -11,9 +11,10 @@@
Menu
} from 'loot-design/src/components/common';
import { colors } from 'loot-design/src/style';
+
+import { useServerURL } from '../hooks/useServerURL';
+
function LoggedInUser({
- history,
files,
budgetId,
userData,
diff --cc packages/desktop-client/src/components/manager/ConfigServer.js
index 942c4b9de0,9ab06605f6..79aa8da788
--- a/packages/desktop-client/src/components/manager/ConfigServer.js
+++ b/packages/desktop-client/src/components/manager/ConfigServer.js
@@@ -8,10 -11,8 +11,9 @@@ import
ButtonWithLoading
} from 'loot-design/src/components/common';
import { colors } from 'loot-design/src/style';
- import { signOut, loggedIn } from 'loot-core/src/client/actions/user';
- import { send } from 'loot-core/src/platform/client/fetch';
+
import { Title, Input } from './subscribe/common';
+import { useServerURL } from '../../hooks/useServerURL';
export default function ConfigServer() {
let dispatch = useDispatch();
diff --cc packages/desktop-client/src/components/manager/ServerURL.js
index 52f117ca4d,16a8db26b0..8862389d6d
--- a/packages/desktop-client/src/components/manager/ServerURL.js
+++ b/packages/desktop-client/src/components/manager/ServerURL.js
@@@ -1,9 -1,18 +1,12 @@@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
+
+ import { send } from 'loot-core/src/platform/client/fetch';
import { View, Text, AnchorLink } from 'loot-design/src/components/common';
+
-export default function ServerURL() {
- let [url, setUrl] = useState(null);
+import { useServerURL } from '../../hooks/useServerURL';
- useEffect(() => {
- async function run() {
- let url = await send('get-server-url');
- setUrl(url);
- }
- run();
- }, []);
+export default function ServerURL() {
+ const url = useServerURL();
return (
<View