7 files changed, 15 insertions, 11 deletions
diff --git a/src/view/com/modals/ChangeHandle.tsx b/src/view/com/modals/ChangeHandle.tsx
index 09d41825f..a1226680e 100644
--- a/src/view/com/modals/ChangeHandle.tsx
+++ b/src/view/com/modals/ChangeHandle.tsx
@@ -316,9 +316,9 @@ function CustomHandleForm({
   // events
   // =
   const onPressCopy = React.useCallback(() => {
-    Clipboard.setString(`did=${store.me.did}`)
+    Clipboard.setString(isDNSForm ? `did=${store.me.did}` : store.me.did)
     Toast.show('Copied to clipboard')
-  }, [store.me.did])
+  }, [store.me.did, isDNSForm])
   const onChangeHandle = React.useCallback(
     (v: string) => {
       setHandle(v)
@@ -410,11 +410,11 @@ function CustomHandleForm({
       {isDNSForm ? (
         <>
           <Text type="md" style={[pal.text, s.pb5, s.pl5]}>
-            Add the following record to your domain:
+            Add the following DNS record to your domain:
           </Text>
           <View style={[styles.dnsTable, pal.btn]}>
             <Text type="md-medium" style={[styles.dnsLabel, pal.text]}>
-              Domain:
+              Host:
             </Text>
             <View style={[styles.dnsValue]}>
               <Text type="mono" style={[styles.monoText, pal.text]}>
diff --git a/src/view/com/modals/Modal.web.tsx b/src/view/com/modals/Modal.web.tsx
index 0e28b1618..687c4fba3 100644
--- a/src/view/com/modals/Modal.web.tsx
+++ b/src/view/com/modals/Modal.web.tsx
@@ -118,10 +118,10 @@ function Modal({modal}: {modal: ModalIface}) {
   }
 
   return (
-    // eslint-disable-next-line
+    // eslint-disable-next-line react-native-a11y/has-valid-accessibility-descriptors
     <TouchableWithoutFeedback onPress={onPressMask}>
       <View style={styles.mask}>
-        {/* eslint-disable-next-line */}
+        {/* eslint-disable-next-line react-native-a11y/has-valid-accessibility-descriptors */}
         <TouchableWithoutFeedback onPress={onInnerPress}>
           <View
             style={[
diff --git a/src/view/com/modals/ProfilePreview.tsx b/src/view/com/modals/ProfilePreview.tsx
index 4efe81225..65b584866 100644
--- a/src/view/com/modals/ProfilePreview.tsx
+++ b/src/view/com/modals/ProfilePreview.tsx
@@ -21,7 +21,7 @@ export const Component = observer(({did}: {did: string}) => {
   const {screen} = useAnalytics()
 
   // track the navigator state to detect if a page-load occurred
-  const navState = useNavigationState(s => s)
+  const navState = useNavigationState(state => state)
   const [initNavState] = useState(navState)
   const isLoading = initNavState !== navState
 
diff --git a/src/view/com/util/Alert.web.tsx b/src/view/com/util/Alert.web.tsx
index 94ccc7e43..bf2456504 100644
--- a/src/view/com/util/Alert.web.tsx
+++ b/src/view/com/util/Alert.web.tsx
@@ -3,10 +3,12 @@ import {AlertButton, AlertStatic} from 'react-native'
 class WebAlert implements Pick<AlertStatic, 'alert'> {
   public alert(title: string, message?: string, buttons?: AlertButton[]): void {
     if (buttons === undefined || buttons.length === 0) {
+      // eslint-disable-next-line no-alert
       window.alert([title, message].filter(Boolean).join('\n'))
       return
     }
 
+    // eslint-disable-next-line no-alert
     const result = window.confirm([title, message].filter(Boolean).join('\n'))
 
     if (result === true) {
diff --git a/src/view/com/util/ViewSelector.tsx b/src/view/com/util/ViewSelector.tsx
index a25ca4d8e..cd3299284 100644
--- a/src/view/com/util/ViewSelector.tsx
+++ b/src/view/com/util/ViewSelector.tsx
@@ -174,8 +174,8 @@ export function Selector({
         <View
           style={[pal.view, styles.outer]}
           onLayout={e => {
-            const {height} = e.nativeEvent.layout
-            setHeight(height || 60)
+            const {height: layoutHeight} = e.nativeEvent.layout
+            setHeight(layoutHeight || 60)
           }}>
           {items.map((item, i) => {
             const selected = i === selectedIndex
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index ce437d6cb..0b3745c30 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -92,7 +92,9 @@ export const ProfileScreen = withAuthRequired(
 
     const onPressCompose = React.useCallback(() => {
       track('ProfileScreen:PressCompose')
-      store.shell.openComposer({mention: uiState.profile.handle})
+      const mention =
+        uiState.profile.handle === store.me.handle ? '' : uiState.profile.handle
+      store.shell.openComposer({mention})
     }, [store, track, uiState])
     const onSelectView = React.useCallback(
       (index: number) => {
diff --git a/src/view/shell/Composer.web.tsx b/src/view/shell/Composer.web.tsx
index 2effa0cca..c0da27da6 100644
--- a/src/view/shell/Composer.web.tsx
+++ b/src/view/shell/Composer.web.tsx
@@ -59,9 +59,9 @@ const styles = StyleSheet.create({
     height: '100%',
     backgroundColor: '#000c',
     alignItems: 'center',
-    justifyContent: 'center',
   },
   container: {
+    marginTop: 50,
     maxWidth: 600,
     width: '100%',
     paddingVertical: 0,