Bluesky app fork with some witchin' additions 💫
witchsky.app
bluesky
fork
client
Fix crash when deleting account from NoAccessScreen (#10283)
+26
-34
+5
-5
src/components/Link.tsx
+5
-5
src/components/Link.tsx
···
141
141
})
142
142
} else {
143
143
if (isExternal) {
144
-
openLink(href, overridePresentation, shouldProxy)
144
+
void openLink(href, overridePresentation, shouldProxy)
145
145
} else {
146
146
const shouldOpenInNewTab = shouldClickOpenNewTab(e)
147
147
148
148
if (isBskyDownloadUrl(href)) {
149
-
shareUrl(BSKY_DOWNLOAD_URL)
149
+
void shareUrl(BSKY_DOWNLOAD_URL)
150
150
} else if (
151
151
shouldOpenInNewTab ||
152
152
href.startsWith('http') ||
153
153
href.startsWith('mailto')
154
154
) {
155
-
openLink(href)
155
+
void openLink(href)
156
156
} else {
157
157
closeModal() // close any active modals
158
158
···
232
232
share: true,
233
233
})
234
234
} else {
235
-
shareUrl(href)
235
+
void shareUrl(href)
236
236
}
237
237
}, [
238
238
disableMismatchWarning,
···
451
451
const onPress = (e: GestureResponderEvent) => {
452
452
const exitEarlyIfFalse = outerOnPress?.(e)
453
453
if (exitEarlyIfFalse === false) return
454
-
Linking.openURL(href)
454
+
void Linking.openURL(href)
455
455
}
456
456
457
457
return (
+21
-29
src/screens/Settings/components/DeleteAccountDialog.tsx
+21
-29
src/screens/Settings/components/DeleteAccountDialog.tsx
···
9
9
import {sanitizeHandle} from '#/lib/strings/handles'
10
10
import {logger} from '#/logger'
11
11
import {useAgent, useSession, useSessionApi} from '#/state/session'
12
-
import {atoms as a, useTheme, web} from '#/alf'
12
+
import {atoms as a, useTheme} from '#/alf'
13
13
import {Admonition} from '#/components/Admonition'
14
14
import {type DialogOuterProps} from '#/components/Dialog'
15
15
import {
···
19
19
import * as TextField from '#/components/forms/TextField'
20
20
import {Envelope_Stroke2_Corner0_Rounded as Envelope} from '#/components/icons/Envelope'
21
21
import {Lock_Stroke2_Corner0_Rounded as Lock} from '#/components/icons/Lock'
22
-
import {createStaticClick, InlineLinkText} from '#/components/Link'
22
+
import {createStaticClick, SimpleInlineLinkText} from '#/components/Link'
23
23
import {Loader} from '#/components/Loader'
24
24
import * as Prompt from '#/components/Prompt'
25
25
import * as toast from '#/components/Toast'
···
113
113
}
114
114
const token = confirmCode.replace(WHITESPACE_RE, '')
115
115
// Inform chat service of intent to delete account.
116
-
const {success} = await agent.api.chat.bsky.actor.deleteAccount(
117
-
undefined,
118
-
{
119
-
headers: DM_SERVICE_HEADERS,
120
-
},
121
-
)
116
+
const {success} = await agent.chat.bsky.actor.deleteAccount(undefined, {
117
+
headers: DM_SERVICE_HEADERS,
118
+
})
122
119
if (!success) {
123
120
throw new Error('Failed to inform chat service of account deletion')
124
121
}
···
213
210
<Admonition style={[a.mt_lg]} type="tip">
214
211
<Trans>
215
212
You can also{' '}
216
-
<Span
217
-
style={[{color: t.palette.primary_500}, web(a.underline)]}
218
-
onPress={handleDeactivate}>
213
+
<SimpleInlineLinkText
214
+
label={_(msg`Temporarily deactivate your account`)}
215
+
{...createStaticClick(handleDeactivate)}>
219
216
temporarily deactivate
220
-
</Span>{' '}
217
+
</SimpleInlineLinkText>{' '}
221
218
your account instead. Your profile, posts, feeds, and lists will
222
219
no longer be visible to other Bluesky users. You can reactivate
223
220
your account at any time by logging in.
···
262
259
{emailSentCount > 1 ? (
263
260
<Trans>
264
261
Email sent!{' '}
265
-
<InlineLinkText
266
-
label={_(msg`Resend`)}
267
-
{...createStaticClick(() => {
268
-
void handleSendEmail()
269
-
})}>
262
+
<SimpleInlineLinkText
263
+
label={_(msg`Click here to resend the email`)}
264
+
{...createStaticClick(handleSendEmail)}>
270
265
Click here to resend.
271
-
</InlineLinkText>
266
+
</SimpleInlineLinkText>
272
267
</Trans>
273
268
) : (
274
269
<Trans>
275
270
Don’t see a code?{' '}
276
-
<InlineLinkText
277
-
label={_(msg`Resend`)}
278
-
{...createStaticClick(() => {
279
-
void handleSendEmail()
280
-
})}>
271
+
<SimpleInlineLinkText
272
+
label={_(msg`Click here to resend the email`)}
273
+
{...createStaticClick(handleSendEmail)}>
281
274
Click here to resend.
282
-
</InlineLinkText>
275
+
</SimpleInlineLinkText>
283
276
</Trans>
284
277
)}{' '}
285
278
<Span style={{top: 1}}>
···
340
333
{currentHandle}
341
334
</Span>{' '}
342
335
and all associated data. Note that this will affect any other{' '}
343
-
<InlineLinkText
344
-
label={_(msg`Learn more about the AT Protocol.`)}
345
-
style={[a.text_md]}
346
-
to="https://bsky.social/about/faq">
336
+
<SimpleInlineLinkText
337
+
to="https://bsky.social/about/faq"
338
+
label={_(msg`AT Protocol FAQ`)}>
347
339
AT Protocol
348
-
</InlineLinkText>{' '}
340
+
</SimpleInlineLinkText>{' '}
349
341
services you use with this account.
350
342
</Trans>
351
343
</Prompt.DescriptionText>