6 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/strings.ts b/src/lib/strings.ts
index b13ac39e5..1bbb4afd4 100644
--- a/src/lib/strings.ts
+++ b/src/lib/strings.ts
@@ -185,8 +185,8 @@ export function makeValidHandle(str: string): string {
 }
 
 export function createFullHandle(name: string, domain: string): string {
-  name = name.replace(/[\.]+$/, '')
-  domain = domain.replace(/^[\.]+/, '')
+  name = (name || '').replace(/[\.]+$/, '')
+  domain = (domain || '').replace(/^[\.]+/, '')
   return `${name}.${domain}`
 }
 
diff --git a/src/view/com/discover/SuggestedFollows.tsx b/src/view/com/discover/SuggestedFollows.tsx
index 5d01a300d..24926df69 100644
--- a/src/view/com/discover/SuggestedFollows.tsx
+++ b/src/view/com/discover/SuggestedFollows.tsx
@@ -167,7 +167,9 @@ const User = ({
           {follow ? (
             <TouchableOpacity onPress={() => onPressUnfollow(item)}>
               <View style={[styles.btn, styles.secondaryBtn, pal.btn]}>
-                <Text style={[s.gray5, s.fw600, s.f15]}>Unfollow</Text>
+                <Text type="button" style={pal.text}>
+                  Unfollow
+                </Text>
               </View>
             </TouchableOpacity>
           ) : (
diff --git a/src/view/com/login/CreateAccount.tsx b/src/view/com/login/CreateAccount.tsx
index 689a4f384..e6ce2efa6 100644
--- a/src/view/com/login/CreateAccount.tsx
+++ b/src/view/com/login/CreateAccount.tsx
@@ -288,7 +288,7 @@ export const CreateAccount = ({onPressBack}: {onPressBack: () => void}) => {
               <View style={styles.groupContent}>
                 <Text style={[s.white, s.p10]}>
                   Your full username will be{' '}
-                  <Text style={s.bold}>
+                  <Text style={[s.white, s.bold]}>
                     @{createFullHandle(handle, userDomain)}
                   </Text>
                 </Text>
diff --git a/src/view/com/util/Link.tsx b/src/view/com/util/Link.tsx
index 05573d999..1e7b90506 100644
--- a/src/view/com/util/Link.tsx
+++ b/src/view/com/util/Link.tsx
@@ -63,7 +63,7 @@ export const TextLink = observer(function Link({
   href,
   text,
 }: {
-  type: TypographyVariant
+  type?: TypographyVariant
   style?: StyleProp<TextStyle>
   href: string
   text: string
diff --git a/src/view/screens/Search.tsx b/src/view/screens/Search.tsx
index 995d05861..d9d933b7e 100644
--- a/src/view/screens/Search.tsx
+++ b/src/view/screens/Search.tsx
@@ -59,7 +59,7 @@ export const Search = ({navIdx, visible, params}: ScreenParams) => {
         <TextInput
           ref={textInput}
           placeholder="Type your query here..."
-          placeholderTextColor={pal.textLight}
+          placeholderTextColor={pal.colors.textLight}
           selectTextOnFocus
           returnKeyType="search"
           style={[pal.text, styles.input]}
diff --git a/src/view/shell/mobile/Menu.tsx b/src/view/shell/mobile/Menu.tsx
index 12bafe2f8..84c3f494e 100644
--- a/src/view/shell/mobile/Menu.tsx
+++ b/src/view/shell/mobile/Menu.tsx
@@ -115,7 +115,7 @@ export const Menu = ({
             type="h3"
             style={[pal.text, styles.profileCardDisplayName]}
             numberOfLines={1}>
-            {store.me.displayName}
+            {store.me.displayName || store.me.handle}
           </Text>
           <Text
             style={[pal.textLight, styles.profileCardHandle]}