Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

Settings: changes kept for another account are listed in the Server & sync block too

Duarte Santos534e596bf016
diff --git a/frontend/src/components/ServerSync.jsx b/frontend/src/components/ServerSync.jsx
index 207c31acd..80456f921 100644
--- a/frontend/src/components/ServerSync.jsx
+++ b/frontend/src/components/ServerSync.jsx
@@ -208,6 +208,8 @@ export function ServerSyncSection({ children }) {
{sync.status === 'auth' && (MOBILE
? <Row icon="link" iconTint="var(--indigo)" title={t('Pair again')} subtitle={t('Your changes are kept here, and merged into your account once it is paired again.')} accessory="chevron" onClick={pairAgain} />
: webauthnOK() && <Row icon="person" iconTint="var(--blue)" title={t('Sign in with passkey')} subtitle={t('Your changes are kept here, and merged into your account once you are signed in again.')} accessory="chevron" onClick={signInAgain} />)}
+ {/* another account's, kept when this one signed in over a copy that still owed them */}
+ <KeptChangesRows />
{children}
</Section>
}
diff --git a/frontend/src/views/Settings.server-sync.test.jsx b/frontend/src/views/Settings.server-sync.test.jsx
index 93ae9edb5..c32a35784 100644
--- a/frontend/src/views/Settings.server-sync.test.jsx
+++ b/frontend/src/views/Settings.server-sync.test.jsx
@@ -152,6 +152,15 @@ describe('Server & sync', () => {
expect(kept.textContent).toContain('gym.example.com')
expect(kept.textContent).toContain('Added back when this device connects as that account again.')
})
+
+ it('signed in as another account, the changes kept for the first are listed in the block', async () => {
+ mocks.MOBILE = false
+ mocks.user = { id: 'u2', name: 'bea' }
+ mocks.kept = [{ server: BASE, uid: 'u1', name: 'andi', at: 1 }]
+ const page = mount(<Settings />)
+ await settle()
+ expect(rowByTitle(block(page), 'Changes kept for andi')).toBeTruthy()
+ })
})
describe('leaving the server', () => {