From b97be39991aba910ba00df7cc1620ea6cc564121 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 08:43:51 +0000 Subject: [PATCH 1/6] chore(deps): update dep @artsy/cohesion from 4.214.0 to v4.215.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ab56be592a1..b8051ffe851 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "braces": "in the resolutions - needed to resolve a security dependency issue - need to remove this when the issue is resolved and packages are updated" }, "dependencies": { - "@artsy/cohesion": "4.214.0", + "@artsy/cohesion": "4.215.0", "@artsy/palette-mobile": "13.2.44", "@artsy/to-title-case": "1.1.0", "@braze/react-native-sdk": "11.0.0", diff --git a/yarn.lock b/yarn.lock index baa8752ab79..569530093a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,10 +10,10 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@artsy/cohesion@4.214.0": - version "4.214.0" - resolved "https://registry.yarnpkg.com/@artsy/cohesion/-/cohesion-4.214.0.tgz#e01d0e189427c94ad9aeade88fb959507a3122da" - integrity sha512-OGbvPxhCC7DuJ+aNR3yw5vXvsHE4jy1fbZs4cWL4KnChjk8vo7xMxqLQFmc8FXckmSFG2O5mdWnrhF8QEgIFPw== +"@artsy/cohesion@4.215.0": + version "4.215.0" + resolved "https://registry.yarnpkg.com/@artsy/cohesion/-/cohesion-4.215.0.tgz#751aa7b6d0c5665d8e538dafcaf9cf6be864c956" + integrity sha512-gb+TMl59R3IPPKucTbsjhFlOom/y8GF4XkEE3Tfe8tA9Agt2FPZCJXIjYELIGiyRn9EKMQUjBeLF1G927ToSzQ== dependencies: core-js "3" From 33f134f5bbe27e2a346e6688ed704313c4aca2b5 Mon Sep 17 00:00:00 2001 From: Sultan Date: Thu, 7 Nov 2024 11:07:09 +0100 Subject: [PATCH 2/6] fix: update task tracking --- src/app/Components/Tasks/Task.tsx | 6 ++-- .../__tests__/HomeViewSectionTasks.tests.tsx | 13 ++++---- .../HomeView/hooks/useHomeViewTracking.ts | 33 ++++++++++--------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/app/Components/Tasks/Task.tsx b/src/app/Components/Tasks/Task.tsx index 565e05ccc37..b3558b83d95 100644 --- a/src/app/Components/Tasks/Task.tsx +++ b/src/app/Components/Tasks/Task.tsx @@ -21,7 +21,7 @@ interface TaskProps { } export const Task = forwardRef( ({ disableSwipeable, onClearTask, onPress, ...restProps }, ref) => { - const { tappedNotification, tappedClearNotification } = useHomeViewTracking() + const { tappedTaskGroup, tappedClearTask } = useHomeViewTracking() const { submitMutation: dismissTask } = useDismissTask() const { submitMutation: acknowledgeTask } = useAcknowledgeTask() const fontScale = PixelRatio.getFontScale() @@ -35,7 +35,7 @@ export const Task = forwardRef( } acknowledgeTask({ variables: { taskID: task.internalID } }) - tappedNotification(ContextModule.actNow, task.actionLink, task.internalID, task.taskType) + tappedTaskGroup(ContextModule.actNow, task.actionLink, task.internalID, task.taskType) onClearTask() navigate(task.actionLink) @@ -43,7 +43,7 @@ export const Task = forwardRef( const handleClearTask = async () => { dismissTask({ variables: { taskID: task.internalID } }) - tappedClearNotification(ContextModule.actNow, task.actionLink, task.internalID, task.taskType) + tappedClearTask(ContextModule.actNow, task.actionLink, task.internalID, task.taskType) onClearTask() } diff --git a/src/app/Scenes/HomeView/Sections/__tests__/HomeViewSectionTasks.tests.tsx b/src/app/Scenes/HomeView/Sections/__tests__/HomeViewSectionTasks.tests.tsx index b7c6176d364..f4e415656c8 100644 --- a/src/app/Scenes/HomeView/Sections/__tests__/HomeViewSectionTasks.tests.tsx +++ b/src/app/Scenes/HomeView/Sections/__tests__/HomeViewSectionTasks.tests.tsx @@ -66,12 +66,13 @@ describe("HomeViewSectionTasks", () => { expect(mockTrackEvent.mock.calls[0]).toMatchInlineSnapshot(` [ { - "action": "tappedNotification", + "action": "tappedTaskGroup", "context_module": "actNow", "context_screen_owner_type": "home", "destination_path": "/test-link", - "notification_category": "send_wire", - "notification_id": "one", + "task_id": "one", + "task_type": "send_wire", + "type": "thumbnail", }, ] `) @@ -97,12 +98,12 @@ describe("HomeViewSectionTasks", () => { expect(mockTrackEvent.mock.calls[0]).toMatchInlineSnapshot(` [ { - "action": "tappedClearNotification", + "action": "tappedClearTask", "context_module": "actNow", "context_screen_owner_type": "home", "destination_path": "/test-link", - "notification_category": "send_wire", - "notification_id": "one", + "task_id": "one", + "task_type": "send_wire", }, ] `) diff --git a/src/app/Scenes/HomeView/hooks/useHomeViewTracking.ts b/src/app/Scenes/HomeView/hooks/useHomeViewTracking.ts index 8d08c79ffc2..8e8035b0bbe 100644 --- a/src/app/Scenes/HomeView/hooks/useHomeViewTracking.ts +++ b/src/app/Scenes/HomeView/hooks/useHomeViewTracking.ts @@ -14,14 +14,14 @@ import { TappedAuctionResultGroup, TappedCardGroup, TappedChangePaymentMethod, - TappedClearNotification, + TappedClearTask, TappedCollectionGroup, TappedFairGroup, TappedHeroUnitGroup, - TappedNotification, TappedNotificationsBell, TappedShowGroup, TappedShowMore, + TappedTaskGroup, TappedViewingRoomGroup, } from "@artsy/cohesion" import { PaymentFailureBanner_Fragment$data } from "__generated__/PaymentFailureBanner_Fragment.graphql" @@ -305,19 +305,19 @@ export const useHomeViewTracking = () => { trackEvent(payload) }, - tappedClearNotification: ( + tappedClearTask: ( contextModule: ContextModule, destinationPath: string, - notificationID: string, - notificationCategory: string + taskID: string, + taskType: string ) => { - const payload: TappedClearNotification = { - action: ActionType.tappedClearNotification, + const payload: TappedClearTask = { + action: ActionType.tappedClearTask, context_module: contextModule, context_screen_owner_type: OwnerType.home, destination_path: destinationPath, - notification_id: notificationID, - notification_category: notificationCategory, + task_id: taskID, + task_type: taskType, } trackEvent(payload) @@ -408,19 +408,20 @@ export const useHomeViewTracking = () => { trackEvent(payload) }, - tappedNotification: ( + tappedTaskGroup: ( contextModule: ContextModule, destinationPath: string, - notificationID: string, - notificationCategory: string + taskID: string, + taskType: string ) => { - const payload: TappedNotification = { - action: ActionType.tappedNotification, + const payload: TappedTaskGroup = { + action: ActionType.tappedTaskGroup, context_module: contextModule, context_screen_owner_type: OwnerType.home, destination_path: destinationPath, - notification_id: notificationID, - notification_category: notificationCategory, + task_id: taskID, + task_type: taskType, + type: "thumbnail", } trackEvent(payload) From 6a47141e3d0c57f9a1f8978becdabcc86ea4c493 Mon Sep 17 00:00:00 2001 From: Sultan Date: Thu, 7 Nov 2024 11:22:28 +0100 Subject: [PATCH 3/6] fix: update tasks tests --- src/app/Components/Tasks/Task.tests.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/Components/Tasks/Task.tests.tsx b/src/app/Components/Tasks/Task.tests.tsx index ca1f6778500..360268beafe 100644 --- a/src/app/Components/Tasks/Task.tests.tsx +++ b/src/app/Components/Tasks/Task.tests.tsx @@ -51,12 +51,12 @@ describe("Task Component", () => { expect(mockClearTask).toHaveBeenCalled() expect(mockDissmissTask).toHaveBeenCalled() expect(mockTrackEvent).toHaveBeenCalledWith({ - action: "tappedClearNotification", + action: "tappedClearTask", context_module: "actNow", context_screen_owner_type: "home", destination_path: "www.test.com", - notification_category: "send_wire", - notification_id: "one", + task_id: "one", + task_type: "send_wire", }) }) @@ -68,12 +68,13 @@ describe("Task Component", () => { expect(mockAcknowledgeTask).toHaveBeenCalled() expect(mockClearTask).toHaveBeenCalled() expect(mockTrackEvent).toHaveBeenCalledWith({ - action: "tappedNotification", + action: "tappedTaskGroup", context_module: "actNow", context_screen_owner_type: "home", destination_path: "www.test.com", - notification_category: "send_wire", - notification_id: "one", + task_id: "one", + task_type: "send_wire", + type: "thumbnail", }) }) }) From ddb76a83ab48f01ee84908fb6d8116e595004739 Mon Sep 17 00:00:00 2001 From: Carlos Date: Thu, 7 Nov 2024 12:57:11 +0100 Subject: [PATCH 4/6] fix(DIA-936): back button not tappable on Android in the new Auth flow (#11069) fix: add zIndex control to AuthScreen wrapper to avoid glitches on Android --- src/app/Scenes/Onboarding/Auth2/components/AuthScreen.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/Scenes/Onboarding/Auth2/components/AuthScreen.tsx b/src/app/Scenes/Onboarding/Auth2/components/AuthScreen.tsx index 8249bb46182..74816b0ccce 100644 --- a/src/app/Scenes/Onboarding/Auth2/components/AuthScreen.tsx +++ b/src/app/Scenes/Onboarding/Auth2/components/AuthScreen.tsx @@ -12,7 +12,9 @@ export const AuthScreen: React.FC = ({ children, name }) => { return ( <> - {children} + + {children} + ) } From 20830b3170c5d357442cfa2fb088f577e85cc330 Mon Sep 17 00:00:00 2001 From: Sultan Al-Maari Date: Thu, 7 Nov 2024 15:25:37 +0100 Subject: [PATCH 5/6] fix(EMI-2166): Fix Home View Tasks onboarding animation (#11072) --- src/app/Scenes/HomeView/Sections/HomeViewSectionTasks.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/Scenes/HomeView/Sections/HomeViewSectionTasks.tsx b/src/app/Scenes/HomeView/Sections/HomeViewSectionTasks.tsx index ad65b856e0f..ea79e7f572d 100644 --- a/src/app/Scenes/HomeView/Sections/HomeViewSectionTasks.tsx +++ b/src/app/Scenes/HomeView/Sections/HomeViewSectionTasks.tsx @@ -1,5 +1,6 @@ import { ContextModule } from "@artsy/cohesion" import { Flex, FlexProps, Skeleton, SkeletonBox, SkeletonText, Spacer } from "@artsy/palette-mobile" +import { useIsFocused } from "@react-navigation/native" import { HomeViewSectionTasksQuery } from "__generated__/HomeViewSectionTasksQuery.graphql" import { HomeViewSectionTasks_section$key } from "__generated__/HomeViewSectionTasks_section.graphql" import { SectionTitle } from "app/Components/SectionTitle" @@ -28,9 +29,9 @@ export const HomeViewSectionTasks: React.FC = ({ }) => { const swipeableRef = useRef(null) const [displayTask, setDisplayTask] = useState(true) - const [isReady, setIsReady] = useState(false) const section = useFragment(tasksFragment, sectionProp) const tasks = extractNodes(section.tasksConnection) + const isFocused = useIsFocused() const { isDismissed } = GlobalStore.useAppState((state) => state.progressiveOnboarding) const { dismiss } = GlobalStore.actions.progressiveOnboarding @@ -40,7 +41,7 @@ export const HomeViewSectionTasks: React.FC = ({ // adding the find-saved-artwork onboarding key to prevent overlap const shouldStartOnboardingAnimation = - isReady && + isFocused && !isDismissed("act-now-tasks").status && !!isDismissed("find-saved-artwork").status && !!swipeableRef.current && @@ -84,7 +85,7 @@ export const HomeViewSectionTasks: React.FC = ({ - setIsReady(true)}> + From 61c9649bc0b23f97ef3a02835406b809072961a3 Mon Sep 17 00:00:00 2001 From: Brian Beckerle <49686530+brainbicycle@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:27:38 -0500 Subject: [PATCH 6/6] chore: lower sentry transaction sample rate #trivial (#11073) lower sentry transaction sample rate --- src/app/system/errorReporting/setupSentry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/system/errorReporting/setupSentry.ts b/src/app/system/errorReporting/setupSentry.ts index 9f6f4b1e267..ef0b1a7abd9 100644 --- a/src/app/system/errorReporting/setupSentry.ts +++ b/src/app/system/errorReporting/setupSentry.ts @@ -68,7 +68,7 @@ export function setupSentry(props: SetupSentryProps = { debug: false }) { autoSessionTracking: true, enableWatchdogTerminationTracking: false, attachStacktrace: true, - tracesSampleRate: props.debug ? 1.0 : 0.1, + tracesSampleRate: props.debug ? 1.0 : 0.05, debug: props.debug, integrations: [ Sentry.reactNativeTracingIntegration({