From c5c4cbbeb2cb48a02ca9f206e9ad81a435b3ab14 Mon Sep 17 00:00:00 2001
From: Jed Fox <git@jedfox.com>
Date: Fri, 17 Mar 2023 13:59:10 -0400
Subject: [PATCH] =?UTF-8?q?Update=20wording=20across=20the=20UI=20to=20cla?=
=?UTF-8?q?rify=20that=20we=20don=E2=80=99t=20own=20any=20servers=20(#768)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/accounts/AccountSyncCheck.js | 8 --------
.../src/components/manager/subscribe/Bootstrap.js | 2 +-
.../src/components/manager/subscribe/Login.js | 2 +-
.../src/components/modals/CreateAccount.js | 4 ++--
.../desktop-client/src/components/settings/Reset.js | 2 +-
packages/loot-core/src/shared/errors.js | 2 +-
.../loot-design/src/components/manager/DeleteFile.js | 11 ++++++-----
upcoming-release-notes/768.md | 6 ++++++
8 files changed, 18 insertions(+), 19 deletions(-)
create mode 100644 upcoming-release-notes/768.md
diff --git a/packages/desktop-client/src/components/accounts/AccountSyncCheck.js b/packages/desktop-client/src/components/accounts/AccountSyncCheck.js
index 0c954beb7..425abb4e1 100644
--- a/packages/desktop-client/src/components/accounts/AccountSyncCheck.js
+++ b/packages/desktop-client/src/components/accounts/AccountSyncCheck.js
@@ -28,14 +28,6 @@ function getErrorMessage(type, code) {
}
break;
- case 'API_ERROR':
- switch (code.toUpperCase()) {
- case 'PLANNED_MAINTENANCE':
- return 'Our servers are currently undergoing maintenance and will be available again soon.';
- default:
- }
- break;
-
case 'RATE_LIMIT_EXCEEDED':
return 'Rate limit exceeded for this item. Please try again later.';
diff --git a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.js b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.js
index cde02ae89..a08b205d2 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.js
+++ b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.js
@@ -25,7 +25,7 @@ export default function Bootstrap() {
case 'network-failure':
return 'Unable to contact the server';
default:
- return "Whoops, an error occurred on our side! We'll try to get it fixed soon.";
+ return `An unknown error occurred: ${error}`;
}
}
diff --git a/packages/desktop-client/src/components/manager/subscribe/Login.js b/packages/desktop-client/src/components/manager/subscribe/Login.js
index b0296f154..d60c5d8d4 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Login.js
+++ b/packages/desktop-client/src/components/manager/subscribe/Login.js
@@ -29,7 +29,7 @@ export default function Login() {
case 'network-failure':
return 'Unable to contact the server';
default:
- return "Whoops, an error occurred on our side! We'll try to get it fixed soon.";
+ return `An unknown error occurred: ${error}`;
}
}
diff --git a/packages/desktop-client/src/components/modals/CreateAccount.js b/packages/desktop-client/src/components/modals/CreateAccount.js
index fdc391dcc..5f56dd00e 100644
--- a/packages/desktop-client/src/components/modals/CreateAccount.js
+++ b/packages/desktop-client/src/components/modals/CreateAccount.js
@@ -31,8 +31,8 @@ export default function CreateAccount({ modalProps, syncServerStatus }) {
<View style={{ maxWidth: 500 }}>
<Text style={{ marginBottom: 10, lineHeight: '1.4em', fontSize: 15 }}>
<strong>Link your bank accounts</strong> to automatically download
- transactions. We offer hundreds of banks to sync with, and our
- service will provide reliable, up-to-date information.
+ transactions. We offer hundreds of banks to sync with, and Nordigen
+ will provide reliable, up-to-date information.
</Text>
<ButtonWithLoading
diff --git a/packages/desktop-client/src/components/settings/Reset.js b/packages/desktop-client/src/components/settings/Reset.js
index 91dbefd39..ecfc482b6 100644
--- a/packages/desktop-client/src/components/settings/Reset.js
+++ b/packages/desktop-client/src/components/settings/Reset.js
@@ -52,7 +52,7 @@ export function ResetSync({ resetSync }) {
>
<Text>
<strong>Reset sync</strong> will remove all local data used to track
- changes for syncing, and create a fresh sync ID on our server. This file
+ changes for syncing, and create a fresh sync ID on the server. This file
on other devices will have to be re-downloaded to use the new sync ID.
Use this if there is a problem with syncing and you want to start fresh.
</Text>
diff --git a/packages/loot-core/src/shared/errors.js b/packages/loot-core/src/shared/errors.js
index ff5cc8539..3b20c0519 100644
--- a/packages/loot-core/src/shared/errors.js
+++ b/packages/loot-core/src/shared/errors.js
@@ -61,7 +61,7 @@ export function getCreateKeyError(error) {
export function getTestKeyError({ reason }) {
switch (reason) {
case 'network':
- return 'Unable to connect to the server. We need to access our server to get some information about your keys.';
+ return 'Unable to connect to the server. We need to access the server to get some information about your keys.';
case 'old-key-style':
return (
'This file is encrypted with an old unsupported key style. Recreate the key ' +
diff --git a/packages/loot-design/src/components/manager/DeleteFile.js b/packages/loot-design/src/components/manager/DeleteFile.js
index b6618d1d9..e2ead6fb7 100644
--- a/packages/loot-design/src/components/manager/DeleteFile.js
+++ b/packages/loot-design/src/components/manager/DeleteFile.js
@@ -48,9 +48,10 @@ export default function DeleteMenu({ modalProps, actions, file }) {
{isRemote && (
<>
<Text>
- This is a <strong>hosted file</strong> which we store to make it
- available for download on any device. You can delete it from our
- servers which will remove it from all of your devices.
+ This is a <strong>hosted file</strong> which means it is stored
+ on your server to make it available for download on any device.
+ You can delete it from the server, which will also remove it
+ from all of your devices.
</Text>
<ButtonWithLoading
@@ -91,10 +92,10 @@ export default function DeleteMenu({ modalProps, actions, file }) {
) : (
<Text>
This a <strong>local file</strong> which is not stored
- on our servers.
+ on a server.
</Text>
)}{' '}
- Deleting it will remove it and all of its backup
+ Deleting it will remove it and all of its backups
permanently.
</Text>
)}
diff --git a/upcoming-release-notes/768.md b/upcoming-release-notes/768.md
new file mode 100644
index 000000000..72f9b4ea8
--- /dev/null
+++ b/upcoming-release-notes/768.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [j-f1]
+---
+
+Update wording across the UI to clarify that we don’t own any servers
--
GitLab