Skip to content

A local-first personal finance app

Add a useServerURL hook

Jed Foxbee949506e71
diff --git a/packages/desktop-client/src/components/manager/ConfigServer.js b/packages/desktop-client/src/components/manager/ConfigServer.js
index 8af7e25fb2..bf96505597 100644
--- a/packages/desktop-client/src/components/manager/ConfigServer.js
+++ b/packages/desktop-client/src/components/manager/ConfigServer.js
@@ -11,25 +11,19 @@ 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();
let history = useHistory();
let [url, setUrl] = useState('');
+ let currentUrl = useServerURL();
+ useEffect(() => {
+ setUrl(currentUrl);
+ }, [currentUrl]);
let [loading, setLoading] = useState(false);
let [error, setError] = useState(null);
- let [currentUrl, setCurrentUrl] = useState(null);
-
- useEffect(() => {
- async function run() {
- let url = await send('get-server-url');
- setUrl(!url || url.indexOf('not-configured') ? '' : url);
- setCurrentUrl(url);
- }
- run();
- }, []);
-
function getErrorMessage(error) {
switch (error) {
case 'network-failure':
diff --git a/packages/desktop-client/src/components/manager/ServerURL.js b/packages/desktop-client/src/components/manager/ServerURL.js
index c1ba72ff99..4121b5cc23 100644
--- a/packages/desktop-client/src/components/manager/ServerURL.js
+++ b/packages/desktop-client/src/components/manager/ServerURL.js
@@ -1,17 +1,9 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
import { View, Text, AnchorLink } from 'loot-design/src/components/common';
-import { send } from 'loot-core/src/platform/client/fetch';
+import useServerURL from '../../hooks/useServerURL';
export default function ServerURL() {
- let [url, setUrl] = useState(null);
-
- useEffect(() => {
- async function run() {
- let url = await send('get-server-url');
- setUrl(url);
- }
- run();
- }, []);
+ const url = useServerURL();
return (
<View
diff --git a/packages/desktop-client/src/hooks/useServerURL.js b/packages/desktop-client/src/hooks/useServerURL.js
new file mode 100644
index 0000000000..cd7c7c8fcd
--- /dev/null
+++ b/packages/desktop-client/src/hooks/useServerURL.js
@@ -0,0 +1,19 @@
+import { useState, useEffect } from 'react';
+import { send } from 'loot-core/src/platform/client/fetch';
+
+function useServerURL() {
+ let [url, setUrl] = useState('');
+ useEffect(() => {
+ async function run() {
+ let url = await send('get-server-url');
+ if (url === 'https://not-configured/') {
+ url = '';
+ }
+ setUrl(url);
+ }
+ run();
+ }, []);
+ return url;
+}
+
+export default useServerURL;