From e9476d270692fc2108a69d236504efb22a1ce511 Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Fri, 21 Apr 2023 18:10:37 -0500
Subject: [PATCH] Tweak copy and layout of app passwords

---
 src/view/com/modals/AddAppPasswords.tsx | 41 ++++++++++++++++++-------
 src/view/screens/AppPasswords.tsx       |  4 +--
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/view/com/modals/AddAppPasswords.tsx b/src/view/com/modals/AddAppPasswords.tsx
index 6e604dff12..1d2f80ff0e 100644
--- a/src/view/com/modals/AddAppPasswords.tsx
+++ b/src/view/com/modals/AddAppPasswords.tsx
@@ -2,6 +2,7 @@ import React, {useState} from 'react'
 import {StyleSheet, TextInput, View, TouchableOpacity} from 'react-native'
 import {Text} from '../util/text/Text'
 import {Button} from '../util/forms/Button'
+import {s} from 'lib/styles'
 import {useStores} from 'state/index'
 import {usePalette} from 'lib/hooks/usePalette'
 import {isDesktopWeb} from 'platform/detection'
@@ -71,23 +72,34 @@ export function Component({}: {}) {
   }, [store])
 
   const createAppPassword = async () => {
-    const newPassword = await store.me.createAppPassword(name)
-    if (newPassword) {
-      setAppPassword(newPassword.password)
-    } else {
+    try {
+      const newPassword = await store.me.createAppPassword(name)
+      if (newPassword) {
+        setAppPassword(newPassword.password)
+      } else {
+        Toast.show('Failed to create app password.')
+        // TODO: better error handling (?)
+      }
+    } catch (e) {
       Toast.show('Failed to create app password.')
-      // TODO: better error handling (?)
+      store.log.error('Failed to create app password', {e})
     }
   }
 
   return (
     <View style={[styles.container, pal.view]} testID="addAppPasswordsModal">
       <View>
-        <Text type="lg">
-          {!appPassword
-            ? 'Please enter a unique name for this App Password. We have generated a random name for you.'
-            : "Please save this secret key somewhere safe and accessible. For security reasons, you won't be able to view it again. If you lose this secret key, you'll need to generate a new one."}
-        </Text>
+        {!appPassword ? (
+          <Text type="lg">
+            Please enter a unique name for this App Password. We have generated
+            a random name for you.
+          </Text>
+        ) : (
+          <Text type="lg">
+            <Text type="lg-bold">Here is your app password.</Text> Use this to
+            sign into the other app along with your handle.
+          </Text>
+        )}
         {!appPassword ? (
           <View style={[pal.btn, styles.textInputWrapper]}>
             <TextInput
@@ -127,6 +139,12 @@ export function Component({}: {}) {
           </TouchableOpacity>
         )}
       </View>
+      {appPassword ? (
+        <Text type="lg" style={[pal.textLight, s.mb10]}>
+          For security reasons, you won't be able to view this again. If you
+          lose this password, you'll need to generate a new one.
+        </Text>
+      ) : null}
       <View style={styles.btnContainer}>
         <Button
           type="primary"
@@ -172,11 +190,12 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     borderRadius: 10,
     marginTop: 16,
-    marginBottom: 8,
+    marginBottom: 12,
   },
   btnContainer: {
     flexDirection: 'row',
     justifyContent: 'center',
+    marginTop: 12,
   },
   btn: {
     flexDirection: 'row',
diff --git a/src/view/screens/AppPasswords.tsx b/src/view/screens/AppPasswords.tsx
index 9ecc147c91..311deb235e 100644
--- a/src/view/screens/AppPasswords.tsx
+++ b/src/view/screens/AppPasswords.tsx
@@ -31,8 +31,6 @@ export const AppPasswords = withAuthRequired(
     )
 
     const onAdd = React.useCallback(async () => {
-      // const createdPassword = await store.me.createAppPassword('test')
-      // console.log(createdPassword)
       store.shell.openModal({name: 'add-app-password'})
     }, [store])
 
@@ -97,7 +95,7 @@ function AppPasswordsHeader() {
     <>
       <ViewHeader title="App Passwords" />
       <Text type="sm" style={[styles.description, pal.text]}>
-        These app passwords can be used to log into Bluesky on other client apps
+        These app passwords can be used to log onto Bluesky in other apps
         without giving them full access to your account or your password.
       </Text>
     </>