An ATproto social media client -- with an independent Appview.

Fix "log in", "log out" to "sign in", "sign out" (#7739)

* log to sign

* logged to signed

authored by quiple.dev and committed by

GitHub d805dec0 326445d3

+35 -33
+1 -1
src/App.native.tsx
··· 118 118 useEffect(() => { 119 119 return listenSessionDropped(() => { 120 120 Toast.show( 121 - _(msg`Sorry! Your session expired. Please log in again.`), 121 + _(msg`Sorry! Your session expired. Please sign in again.`), 122 122 'info', 123 123 ) 124 124 })
+1 -1
src/App.web.tsx
··· 94 94 useEffect(() => { 95 95 return listenSessionDropped(() => { 96 96 Toast.show( 97 - _(msg`Sorry! Your session expired. Please log in again.`), 97 + _(msg`Sorry! Your session expired. Please sign in again.`), 98 98 'info', 99 99 ) 100 100 })
+1 -1
src/components/AccountList.tsx
··· 62 62 testID="chooseAddAccountBtn" 63 63 style={[a.flex_1]} 64 64 onPress={pendingDid ? undefined : onPressAddAccount} 65 - label={_(msg`Login to account that is not listed`)}> 65 + label={_(msg`Sign in to account that is not listed`)}> 66 66 {({hovered, pressed}) => ( 67 67 <View 68 68 style={[
+1 -1
src/components/dialogs/Signin.tsx
··· 43 43 44 44 return ( 45 45 <Dialog.ScrollableInner 46 - label={_(msg`Sign into Bluesky or create a new account`)} 46 + label={_(msg`Sign in to Bluesky or create a new account`)} 47 47 style={[gtMobile ? {width: 'auto', maxWidth: 420} : a.w_full]}> 48 48 <View style={[!isNative && a.p_2xl]}> 49 49 <View
+5 -5
src/screens/Deactivated.tsx
··· 86 86 case 'Bad token scope': 87 87 setError( 88 88 _( 89 - msg`You're logged in with an App Password. Please log in with your main password to continue deactivating your account.`, 89 + msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`, 90 90 ), 91 91 ) 92 92 break ··· 148 148 {pending && <ButtonIcon icon={Loader} position="right" />} 149 149 </Button> 150 150 <Button 151 - label={_(msg`Cancel reactivation and log out`)} 151 + label={_(msg`Cancel reactivation and sign out`)} 152 152 size="large" 153 153 variant="solid" 154 154 color="secondary" ··· 183 183 <> 184 184 <Text 185 185 style={[t.atoms.text_contrast_medium, a.pb_md, a.leading_snug]}> 186 - <Trans>Or, log into one of your other accounts.</Trans> 186 + <Trans>Or, sign in to one of your other accounts.</Trans> 187 187 </Text> 188 188 <AccountList 189 189 onSelectAccount={onSelectAccount} ··· 199 199 <Trans>Or, continue with another account.</Trans> 200 200 </Text> 201 201 <Button 202 - label={_(msg`Log in or sign up`)} 202 + label={_(msg`Sign in or sign up`)} 203 203 size="large" 204 204 variant="solid" 205 205 color="secondary" 206 206 onPress={() => setShowLoggedOut(true)}> 207 207 <ButtonText> 208 - <Trans>Log in or sign up</Trans> 208 + <Trans>Sign in or sign up</Trans> 209 209 </ButtonText> 210 210 </Button> 211 211 </>
+4 -2
src/screens/Login/LoginForm.tsx
··· 298 298 /> 299 299 </TextField.Root> 300 300 <Text style={[a.text_sm, t.atoms.text_contrast_medium, a.mt_sm]}> 301 - <Trans>Check your email for a login code and enter it here.</Trans> 301 + <Trans> 302 + Check your email for a sign in code and enter it here. 303 + </Trans> 302 304 </Text> 303 305 </View> 304 306 )} ··· 319 321 <Button 320 322 testID="loginRetryButton" 321 323 label={_(msg`Retry`)} 322 - accessibilityHint={_(msg`Retries login`)} 324 + accessibilityHint={_(msg`Retries sign in`)} 323 325 variant="solid" 324 326 color="secondary" 325 327 size="large"
+1 -1
src/screens/Settings/components/AddAppPasswordDialog.tsx
··· 188 188 </Text> 189 189 <Text style={[a.text_md, a.leading_snug]}> 190 190 <Trans> 191 - Use this to sign into the other app along with your handle. 191 + Use this to sign in to the other app along with your handle. 192 192 </Trans> 193 193 </Text> 194 194 <CopyButton
+1 -1
src/screens/Settings/components/DeactivateAccountDialog.tsx
··· 51 51 case 'Bad token scope': 52 52 setError( 53 53 _( 54 - msg`You're logged in with an App Password. Please log in with your main password to continue deactivating your account.`, 54 + msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`, 55 55 ), 56 56 ) 57 57 break
+1 -1
src/screens/Settings/components/Email2FAToggle.tsx
··· 51 51 <Prompt.Basic 52 52 control={enableDialogControl} 53 53 title={_(msg`Enable Email 2FA`)} 54 - description={_(msg`Require an email code to log in to your account.`)} 54 + description={_(msg`Require an email code to sign in to your account.`)} 55 55 onConfirm={enableEmailAuthFactor} 56 56 confirmButtonCta={_(msg`Enable`)} 57 57 />
+2 -2
src/screens/SignupQueued.tsx
··· 90 90 variant="ghost" 91 91 size="large" 92 92 color="primary" 93 - label={_(msg`Log out`)} 93 + label={_(msg`Sign out`)} 94 94 onPress={() => logoutCurrentAccount('SignupQueued')}> 95 95 <ButtonText> 96 - <Trans>Log out</Trans> 96 + <Trans>Sign out</Trans> 97 97 </ButtonText> 98 98 </Button> 99 99 )
+2 -2
src/screens/Takendown.tsx
··· 82 82 variant="solid" 83 83 size="large" 84 84 color="secondary_inverted" 85 - label={_(msg`Log out`)} 85 + label={_(msg`Sign out`)} 86 86 onPress={() => logoutCurrentAccount('Takendown')}> 87 87 <ButtonText> 88 - <Trans>Log Out</Trans> 88 + <Trans>Sign Out</Trans> 89 89 </ButtonText> 90 90 </Button> 91 91 )
+2 -2
src/state/queries/list-memberships.ts
··· 101 101 >({ 102 102 mutationFn: async ({listUri, actorDid}) => { 103 103 if (!currentAccount) { 104 - throw new Error('Not logged in') 104 + throw new Error('Not signed in') 105 105 } 106 106 const res = await agent.app.bsky.graph.listitem.create( 107 107 {repo: currentAccount.did}, ··· 160 160 >({ 161 161 mutationFn: async ({membershipUri}) => { 162 162 if (!currentAccount) { 163 - throw new Error('Not logged in') 163 + throw new Error('Not signed in') 164 164 } 165 165 const membershipUrip = new AtUri(membershipUri) 166 166 await agent.app.bsky.graph.listitem.delete({
+2 -2
src/state/queries/list.ts
··· 60 60 avatar, 61 61 }) { 62 62 if (!currentAccount) { 63 - throw new Error('Not logged in') 63 + throw new Error('Not signed in') 64 64 } 65 65 if ( 66 66 purpose !== 'app.bsky.graph.defs#curatelist' && ··· 126 126 async mutationFn({uri, name, description, descriptionFacets, avatar}) { 127 127 const {hostname, rkey} = new AtUri(uri) 128 128 if (!currentAccount) { 129 - throw new Error('Not logged in') 129 + throw new Error('Not signed in') 130 130 } 131 131 if (currentAccount.did !== hostname) { 132 132 throw new Error('You do not own this list')
+2 -2
src/state/queries/messages/actor-declaration.ts
··· 18 18 19 19 return useMutation({ 20 20 mutationFn: async (allowIncoming: 'all' | 'none' | 'following') => { 21 - if (!currentAccount) throw new Error('Not logged in') 21 + if (!currentAccount) throw new Error('Not signed in') 22 22 const result = await agent.api.com.atproto.repo.putRecord({ 23 23 repo: currentAccount.did, 24 24 collection: 'chat.bsky.actor.declaration', ··· 68 68 69 69 return useMutation({ 70 70 mutationFn: async () => { 71 - if (!currentAccount) throw new Error('Not logged in') 71 + if (!currentAccount) throw new Error('Not signed in') 72 72 // TODO(sam): remove validate: false once PDSes have the new lexicon 73 73 const result = await agent.api.com.atproto.repo.deleteRecord({ 74 74 repo: currentAccount.did,
+1 -1
src/state/queries/pinned-post.ts
··· 32 32 updatePostShadow(queryClient, postUri, {pinned: pinCurrentPost}) 33 33 34 34 // get the currently pinned post so we can optimistically remove the pin from it 35 - if (!currentAccount) throw new Error('Not logged in') 35 + if (!currentAccount) throw new Error('Not signed in') 36 36 const {data: profile} = await agent.getProfile({ 37 37 actor: currentAccount.did, 38 38 })
+1 -1
src/state/queries/starter-packs.ts
··· 294 294 return useMutation({ 295 295 mutationFn: async ({listUri, rkey}: {listUri?: string; rkey: string}) => { 296 296 if (!agent.session) { 297 - throw new Error(`Requires logged in user`) 297 + throw new Error(`Requires signed in user`) 298 298 } 299 299 300 300 if (listUri) {
+1 -1
src/view/com/auth/SplashScreen.tsx
··· 60 60 onPress={onPressSignin} 61 61 label={_(msg`Sign in`)} 62 62 accessibilityHint={_( 63 - msg`Opens flow to sign into your existing Bluesky account`, 63 + msg`Opens flow to sign in to your existing Bluesky account`, 64 64 )} 65 65 size="large" 66 66 variant="solid"
+1 -1
src/view/com/auth/SplashScreen.web.tsx
··· 122 122 onPress={onPressSignin} 123 123 label={_(msg`Sign in`)} 124 124 accessibilityHint={_( 125 - msg`Opens flow to sign into your existing Bluesky account`, 125 + msg`Opens flow to sign in to your existing Bluesky account`, 126 126 )} 127 127 size="large" 128 128 variant="solid"
+1 -1
src/view/com/profile/ProfileMenu.tsx
··· 399 399 control={loggedOutWarningPromptControl} 400 400 title={_(msg`Note about sharing`)} 401 401 description={_( 402 - msg`This profile is only visible to logged-in users. It won't be visible to people who aren't logged in.`, 402 + msg`This profile is only visible to logged-in users. It won't be visible to people who aren't signed in.`, 403 403 )} 404 404 onConfirm={onPressShare} 405 405 confirmButtonCta={_(msg`Share anyway`)}
+1 -1
src/view/com/util/forms/PostDropdownBtnMenuItems.tsx
··· 717 717 control={loggedOutWarningPromptControl} 718 718 title={_(msg`Note about sharing`)} 719 719 description={_( 720 - msg`This post is only visible to logged-in users. It won't be visible to people who aren't logged in.`, 720 + msg`This post is only visible to logged-in users. It won't be visible to people who aren't signed in.`, 721 721 )} 722 722 onConfirm={onSharePost} 723 723 confirmButtonCta={_(msg`Share anyway`)}
+1 -1
src/view/com/util/post-ctrls/PostCtrls.tsx
··· 366 366 control={loggedOutWarningPromptControl} 367 367 title={_(msg`Note about sharing`)} 368 368 description={_( 369 - msg`This post is only visible to logged-in users. It won't be visible to people who aren't logged in.`, 369 + msg`This post is only visible to logged-in users. It won't be visible to people who aren't signed in.`, 370 370 )} 371 371 onConfirm={onShare} 372 372 confirmButtonCta={_(msg`Share anyway`)}
+2 -2
src/view/screens/DebugMod.tsx
··· 378 378 <Toggle.Checkbox /> 379 379 <Toggle.LabelText>Adult disabled</Toggle.LabelText> 380 380 </Toggle.Item> 381 - <Toggle.Item name="loggedOut" label="Logged out"> 381 + <Toggle.Item name="loggedOut" label="Signed out"> 382 382 <Toggle.Checkbox /> 383 - <Toggle.LabelText>Logged out</Toggle.LabelText> 383 + <Toggle.LabelText>Signed out</Toggle.LabelText> 384 384 </Toggle.Item> 385 385 </View> 386 386 </Toggle.Group>