robinwobin.dev
forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
adding 'better auto resolve stuff'
OAuth may be coming soon since blacksky just implemented it and I saw another implementation recently that wasn't from a former Bluesky PBC employee
xan.lol
+7
-6
src/screens/Login/LoginForm.tsx
+7
-6
src/screens/Login/LoginForm.tsx
···
14
14
import {useLingui} from '@lingui/react'
15
15
16
16
import {useRequestNotificationsPermission} from '#/lib/notifications/notifications'
17
-
import {isNetworkError} from '#/lib/strings/errors'
18
-
import {cleanError} from '#/lib/strings/errors'
17
+
import {cleanError, isNetworkError} from '#/lib/strings/errors'
19
18
import {createFullHandle} from '#/lib/strings/handles'
19
+
import {isValidDomain} from '#/lib/strings/url-helpers'
20
20
import {logger} from '#/logger'
21
21
import {useSetHasCheckedForStarterPack} from '#/state/preferences/used-starter-packs'
22
22
import {useSessionApi} from '#/state/session'
···
86
86
}, [])
87
87
88
88
const onPressNext = async () => {
89
-
if (isProcessing) return
89
+
if (isProcessing || isResolvingService || serviceUrl === undefined) return
90
90
Keyboard.dismiss()
91
91
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
92
92
setError('')
···
193
193
<Trans>Hosting provider</Trans>
194
194
{isResolvingService && (
195
195
<ActivityIndicator
196
-
size={12}
196
+
size={10}
197
197
color={t.palette.contrast_500}
198
198
style={a.ml_sm}
199
199
/>
···
230
230
if (!id) return
231
231
if (
232
232
id.startsWith('did:') ||
233
-
(id.includes('.') && !id.includes('@'))
233
+
(!id.includes('@') && isValidDomain(id))
234
234
) {
235
235
debouncedResolveService(id)
236
236
}
···
373
373
variant="solid"
374
374
color="primary"
375
375
size="large"
376
-
onPress={onPressNext}>
376
+
onPress={onPressNext}
377
+
disabled={isResolvingService || serviceUrl === undefined}>
377
378
<ButtonText>
378
379
<Trans>Next</Trans>
379
380
</ButtonText>