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 ? (
<>
- Add the following record to your domain:
+ Add the following DNS record to your domain:
- Domain:
+ Host:
--
2.51.2
From a0dca81a749269839dc78c1952305ba4d0f5568d Mon Sep 17 00:00:00 2001
From: Eric Bailey
Date: Fri, 25 Aug 2023 10:47:47 -0500
Subject: [PATCH 2/4] don't mention own user from composer (#1279)
---
src/view/screens/Profile.tsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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) => {
--
2.51.2
From b15a435069a4721214a542af0bd0d24c8ae2066d Mon Sep 17 00:00:00 2001
From: Eric Bailey
Date: Fri, 25 Aug 2023 10:48:38 -0500
Subject: [PATCH 3/4] Eslint updates (#1281)
* eslint: Update eslintrc
* eslint: Strings must use singlequote quotes
* eslint: expected { after if-condition
* eslint: update warnings
* a little cleanup
* remove conflicted file
---------
Co-authored-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: Paul Frazee
---
.eslintrc.js | 2 ++
src/view/com/modals/Modal.web.tsx | 4 ++--
src/view/com/modals/ProfilePreview.tsx | 2 +-
src/view/com/util/Alert.web.tsx | 2 ++
src/view/com/util/ViewSelector.tsx | 4 ++--
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index 9d6e6df80..46b5231b2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,6 +9,7 @@ module.exports = {
plugins: ['@typescript-eslint', 'detox'],
ignorePatterns: [
'**/__mocks__/*.ts',
+ 'src/platform/polyfills.ts',
'src/third-party',
'ios',
'android',
@@ -25,6 +26,7 @@ module.exports = {
files: ['*.js', '*.mjs', '*.ts', '*.tsx'],
rules: {
semi: [2, 'never'],
+ 'react-native/no-inline-styles': 0,
},
},
],
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
- {/* eslint-disable-next-line */}
+ {/* eslint-disable-next-line react-native-a11y/has-valid-accessibility-descriptors */}
{
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 {
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({
{
- 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
--
2.51.2
From a3cb12f584f6d55a0754fd608fb00d9b7f29e807 Mon Sep 17 00:00:00 2001
From: Paul Frazee
Date: Fri, 25 Aug 2023 10:30:15 -0700
Subject: [PATCH 4/4] Move the web composer to the top of the screen (#1282)
---
src/view/shell/Composer.web.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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,