From 7197a064d78268a43398a8c236dac9a458f0bd14 Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Mon, 17 Nov 2025 18:01:02 +0200 Subject: [PATCH] [v1.110] Release prep (#9399) * yml formatting whatever * fix date input color * fix up report dialog tests * dumb fix to bypass save password popup * remove tooltip in e2e * Update index.e2e.tsx * skip gate in e2e --- __e2e__/flows/create-account.yml | 10 ++++++++-- __e2e__/flows/home-screen.yml | 6 +++--- __e2e__/flows/post-report-flow.yml | 3 ++- .../flows/report-dialog/account.default.yml | 8 +++++--- __e2e__/flows/report-dialog/post.default.yml | 8 +++++--- .../flows/report-dialog/post.edit-reason.yml | 20 +++++++++++++------ .../flows/report-dialog/post.reason-other.yml | 8 +++++--- __e2e__/perf-test.yml | 3 +-- src/components/Tooltip/index.e2e.tsx | 19 ++++++++++++++++++ .../forms/DateField/index.shared.tsx | 4 ++-- src/components/forms/TextField.tsx | 2 +- .../moderation/ReportDialog/index.tsx | 2 +- src/env/common.ts | 7 ++++++- src/view/com/posts/PostFeedItem.tsx | 3 ++- 14 files changed, 74 insertions(+), 29 deletions(-) create mode 100644 src/components/Tooltip/index.e2e.tsx diff --git a/__e2e__/flows/create-account.yml b/__e2e__/flows/create-account.yml index eb2f05ca1e..46a9275cc7 100644 --- a/__e2e__/flows/create-account.yml +++ b/__e2e__/flows/create-account.yml @@ -31,9 +31,15 @@ appId: xyz.blueskyweb.app text: "Your account" - tapOn: id: "nextBtn" +- waitForAnimationToEnd - tapOn: - text: "Not Now" - optional: true + # save password thing no longer seems to be in hierarchy + # tap on something else instead + point: 20%,20% + repeat: 2 + delay: 1000 +- tapOn: + id: "handleInput" - inputText: "e2e-test" - extendedWaitUntil: visible: diff --git a/__e2e__/flows/home-screen.yml b/__e2e__/flows/home-screen.yml index 420f68b92b..df2f884693 100644 --- a/__e2e__/flows/home-screen.yml +++ b/__e2e__/flows/home-screen.yml @@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app - runScript: file: ../setupServer.js env: - SERVER_PATH: ?users&follows&posts&feeds + SERVER_PATH: ?users&follows&posts&feeds - runFlow: file: ../setupApp.yml - tapOn: @@ -11,7 +11,7 @@ appId: xyz.blueskyweb.app - extendedWaitUntil: visible: - text: "Feeds ✨" + text: "Feeds ✨" - tapOn: label: "Can go to feeds page using feeds button in tab bar" text: "Feeds ✨" @@ -50,6 +50,6 @@ appId: xyz.blueskyweb.app label: "Can delete posts" id: "postDropdownBtn" childOf: - id: "feedItem-by-alice.test" + id: "feedItem-by-alice.test" - tapOn: "Delete post" - tapOn: "Delete" diff --git a/__e2e__/flows/post-report-flow.yml b/__e2e__/flows/post-report-flow.yml index a509fcc024..7806dba7d6 100644 --- a/__e2e__/flows/post-report-flow.yml +++ b/__e2e__/flows/post-report-flow.yml @@ -17,7 +17,8 @@ appId: xyz.blueskyweb.app index: 0 - tapOn: id: "postDropdownReportBtn" -- tapOn: "Create report for Misleading Post" +- tapOn: "Create report for Misleading" +- tapOn: "Create report for Spam" - tapOn: "Send report to Dev-env Moderation" - tapOn: point: "50%,90%" diff --git a/__e2e__/flows/report-dialog/account.default.yml b/__e2e__/flows/report-dialog/account.default.yml index 0d42254737..372fc31c7e 100644 --- a/__e2e__/flows/report-dialog/account.default.yml +++ b/__e2e__/flows/report-dialog/account.default.yml @@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app - runScript: file: ../../setupServer.js env: - SERVER_PATH: ?users&follows&posts&feeds + SERVER_PATH: ?users&follows&posts&feeds - runFlow: file: ../../setupApp.yml - tapOn: @@ -15,9 +15,11 @@ appId: xyz.blueskyweb.app - tapOn: id: "profileHeaderDropdownReportBtn" - tapOn: - id: "report:option:com.atproto.moderation.defs#reasonSpam" + id: "report:category:Misleading" +- tapOn: + id: "report:option:Spam" - assertVisible: - id: "report:labeler:mod-authority.test" + text: "Send report to Dev-env Moderation" - tapOn: id: "report:submit" - assertNotVisible: diff --git a/__e2e__/flows/report-dialog/post.default.yml b/__e2e__/flows/report-dialog/post.default.yml index 955177b594..be3ac6b68a 100644 --- a/__e2e__/flows/report-dialog/post.default.yml +++ b/__e2e__/flows/report-dialog/post.default.yml @@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app - runScript: file: ../../setupServer.js env: - SERVER_PATH: ?users&follows&posts&feeds + SERVER_PATH: ?users&follows&posts&feeds - runFlow: file: ../../setupApp.yml - tapOn: @@ -15,9 +15,11 @@ appId: xyz.blueskyweb.app - tapOn: id: "postDropdownReportBtn" - tapOn: - id: "report:option:com.atproto.moderation.defs#reasonSpam" + id: "report:category:Misleading" +- tapOn: + id: "report:option:Spam" - assertVisible: - id: "report:labeler:mod-authority.test" + text: "Send report to Dev-env Moderation" - tapOn: id: "report:submit" - assertNotVisible: diff --git a/__e2e__/flows/report-dialog/post.edit-reason.yml b/__e2e__/flows/report-dialog/post.edit-reason.yml index 3c612d4bad..eec5794c4f 100644 --- a/__e2e__/flows/report-dialog/post.edit-reason.yml +++ b/__e2e__/flows/report-dialog/post.edit-reason.yml @@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app - runScript: file: ../../setupServer.js env: - SERVER_PATH: ?users&follows&posts&feeds + SERVER_PATH: ?users&follows&posts&feeds - runFlow: file: ../../setupApp.yml - tapOn: @@ -15,20 +15,28 @@ appId: xyz.blueskyweb.app - tapOn: id: "postDropdownReportBtn" - tapOn: - id: "report:option:com.atproto.moderation.defs#reasonOther" + id: "report:category:Misleading" +- tapOn: + id: "report:option:Other misleading content" - assertVisible: - id: "report:labeler:mod-authority.test" + text: Your report will be sent to Dev-env Moderation.* # reason "other" defaults with details open - assertVisible: id: "report:details" - tapOn: - id: "report:clearOption" + id: "report:clearReportOption" - assertNotVisible: id: "report:details" - tapOn: - id: "report:option:com.atproto.moderation.defs#reasonSpam" + id: "report:clearCategory" +- assertNotVisible: + id: "report:option:Other misleading content" +- tapOn: + id: "report:category:Misleading" +- tapOn: + id: "report:option:Spam" - assertVisible: - id: "report:labeler:mod-authority.test" + text: Your report will be sent to Dev-env Moderation.* - tapOn: id: "report:submit" - assertNotVisible: diff --git a/__e2e__/flows/report-dialog/post.reason-other.yml b/__e2e__/flows/report-dialog/post.reason-other.yml index 39c0e7084d..72da5a9fdf 100644 --- a/__e2e__/flows/report-dialog/post.reason-other.yml +++ b/__e2e__/flows/report-dialog/post.reason-other.yml @@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app - runScript: file: ../../setupServer.js env: - SERVER_PATH: ?users&follows&posts&feeds + SERVER_PATH: ?users&follows&posts&feeds - runFlow: file: ../../setupApp.yml - tapOn: @@ -15,9 +15,11 @@ appId: xyz.blueskyweb.app - tapOn: id: "postDropdownReportBtn" - tapOn: - id: "report:option:com.atproto.moderation.defs#reasonOther" + id: "report:category:Misleading" +- tapOn: + id: "report:option:Other misleading content" - assertVisible: - id: "report:labeler:mod-authority.test" + text: "Send report to Dev-env Moderation" # reason "other" defaults with details open - assertVisible: id: "report:details" diff --git a/__e2e__/perf-test.yml b/__e2e__/perf-test.yml index 7a7b7a18c9..c27bab26e4 100644 --- a/__e2e__/perf-test.yml +++ b/__e2e__/perf-test.yml @@ -1,4 +1,3 @@ - # flow.yaml appId: xyz.blueskyweb.app @@ -33,7 +32,7 @@ appId: xyz.blueskyweb.app direction: "LEFT" - swipe: direction: "LEFT" -- swipe: +- swipe: direction: "LEFT" - swipe: direction: "RIGHT" diff --git a/src/components/Tooltip/index.e2e.tsx b/src/components/Tooltip/index.e2e.tsx new file mode 100644 index 0000000000..905da174c1 --- /dev/null +++ b/src/components/Tooltip/index.e2e.tsx @@ -0,0 +1,19 @@ +export function SheetCompatProvider({children}: {children: React.ReactNode}) { + return children +} + +export function Outer({children}: {children: React.ReactNode}) { + return children +} + +export function Target({children}: {children: React.ReactNode}) { + return children +} + +export function Content() { + return null +} + +export function TextBubble() { + return null +} diff --git a/src/components/forms/DateField/index.shared.tsx b/src/components/forms/DateField/index.shared.tsx index b0522175c6..24344b4417 100644 --- a/src/components/forms/DateField/index.shared.tsx +++ b/src/components/forms/DateField/index.shared.tsx @@ -73,8 +73,8 @@ export function DateFieldButton({ a.flex_row, a.flex_1, a.w_full, - a.rounded_sm, - t.atoms.bg_contrast_25, + {borderRadius: 10}, + t.atoms.bg_contrast_50, a.align_center, hovered ? chromeHover : {}, focused || pressed ? chromeFocus : {}, diff --git a/src/components/forms/TextField.tsx b/src/components/forms/TextField.tsx index 48f71e73a0..62f30db47b 100644 --- a/src/components/forms/TextField.tsx +++ b/src/components/forms/TextField.tsx @@ -266,7 +266,7 @@ export function createInput(Component: typeof TextInput) { a.z_10, a.absolute, a.inset_0, - a.rounded_sm, + {borderRadius: 10}, t.atoms.bg_contrast_50, {borderColor: 'transparent', borderWidth: 2}, ctx.hovered ? chromeHover : {}, diff --git a/src/components/moderation/ReportDialog/index.tsx b/src/components/moderation/ReportDialog/index.tsx index a264d12bc2..2331db3ea6 100644 --- a/src/components/moderation/ReportDialog/index.tsx +++ b/src/components/moderation/ReportDialog/index.tsx @@ -685,7 +685,7 @@ function CategoryCard({ }, [onSelect, option]) return (