From f7c500c7c2c1551545c473e4fa135b9b5f8a986a Mon Sep 17 00:00:00 2001
From: Anastasia Poupeney <anastasiasergienko@gmail.com>
Date: Wed, 4 Jul 2018 22:12:34 +0200
Subject: [PATCH 1/2] integrate tracking of pages and some events in the
 receive flow

---
 src/components/modals/Receive/steps/01-step-account.js    | 2 +-
 .../modals/Receive/steps/02-step-connect-device.js        | 3 +++
 .../modals/Receive/steps/03-step-confirm-address.js       | 8 ++++++--
 .../modals/Receive/steps/04-step-receive-funds.js         | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/modals/Receive/steps/01-step-account.js b/src/components/modals/Receive/steps/01-step-account.js
index a5b402a7..6e7fb46f 100644
--- a/src/components/modals/Receive/steps/01-step-account.js
+++ b/src/components/modals/Receive/steps/01-step-account.js
@@ -13,7 +13,7 @@ import type { StepProps } from '../index'
 export default function StepAccount({ t, account, onChangeAccount }: StepProps) {
   return (
     <Box flow={1}>
-      <TrackPage category="Receive" name="Step1" />
+      <TrackPage category="Receive Flow" name="Step 1" />
       <Label>{t('app:receive.steps.chooseAccount.label')}</Label>
       <SelectAccount autoFocus onChange={onChangeAccount} value={account} />
     </Box>
diff --git a/src/components/modals/Receive/steps/02-step-connect-device.js b/src/components/modals/Receive/steps/02-step-connect-device.js
index d5d81513..8e4fbfc7 100644
--- a/src/components/modals/Receive/steps/02-step-connect-device.js
+++ b/src/components/modals/Receive/steps/02-step-connect-device.js
@@ -5,6 +5,7 @@ import React from 'react'
 import Box from 'components/base/Box'
 import Button from 'components/base/Button'
 import EnsureDeviceApp from 'components/EnsureDeviceApp'
+import TrackPage from 'analytics/TrackPage'
 
 import type { StepProps } from '../index'
 
@@ -26,7 +27,9 @@ export function StepConnectDeviceFooter({
 }: StepProps) {
   return (
     <Box horizontal flow={2}>
+      <TrackPage category="Receive Flow" name="Step 2" />
       <Button
+        event="Receive Flow Without Device Clicked"
         onClick={() => {
           onSkipConfirm()
           transitionTo('receive')
diff --git a/src/components/modals/Receive/steps/03-step-confirm-address.js b/src/components/modals/Receive/steps/03-step-confirm-address.js
index f7ab82d5..a1ddca5f 100644
--- a/src/components/modals/Receive/steps/03-step-confirm-address.js
+++ b/src/components/modals/Receive/steps/03-step-confirm-address.js
@@ -18,9 +18,10 @@ export default class StepConfirmAddress extends PureComponent<StepProps> {
     invariant(device, 'No device given')
     return (
       <Container>
-        <TrackPage category="Receive" name="Step3" />
+        <TrackPage category="Receive Flow" name="Step 3" />
         {isAddressVerified === false ? (
           <Fragment>
+            <TrackPage category="Receive Flow" name="Step 3 Address Not Verified Error" />
             <Title>
               <TranslatedError error={verifyAddressError} />
             </Title>
@@ -50,10 +51,13 @@ export function StepConfirmAddressFooter({ t, transitionTo, onRetry }: StepProps
   // This will be displayed only if user rejected address
   return (
     <Fragment>
-      <Button>{t('app:receive.steps.confirmAddress.support')}</Button>
+      <Button event="Receive Flow Step 3 Contact Us Clicked">
+        {t('app:receive.steps.confirmAddress.support')}
+      </Button>
       <Button
         ml={2}
         primary
+        event="Receive Flow Step 3 Retry Clicked"
         onClick={() => {
           onRetry()
           transitionTo('device')
diff --git a/src/components/modals/Receive/steps/04-step-receive-funds.js b/src/components/modals/Receive/steps/04-step-receive-funds.js
index faed5755..36384137 100644
--- a/src/components/modals/Receive/steps/04-step-receive-funds.js
+++ b/src/components/modals/Receive/steps/04-step-receive-funds.js
@@ -59,7 +59,7 @@ export default class StepReceiveFunds extends PureComponent<StepProps> {
     invariant(account, 'No account given')
     return (
       <Box flow={5}>
-        <TrackPage category="Receive" name="Step4" />
+        <TrackPage category="Receive Flow" name="Step 4" />
         <CurrentAddressForAccount
           account={account}
           isAddressVerified={isAddressVerified}

From 85e79ff6ad143c51493176636557955d5b4c10e7 Mon Sep 17 00:00:00 2001
From: Anastasia Poupeney <anastasiasergienko@gmail.com>
Date: Wed, 4 Jul 2018 22:30:13 +0200
Subject: [PATCH 2/2] fixing bug on Contact Us doing nothing on the receive
 flow Reject screen

---
 src/components/modals/Receive/index.js                    | 8 +++++++-
 .../modals/Receive/steps/03-step-confirm-address.js       | 4 ++--
 src/config/support.js                                     | 3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/modals/Receive/index.js b/src/components/modals/Receive/index.js
index 52fe9c88..8e68c04e 100644
--- a/src/components/modals/Receive/index.js
+++ b/src/components/modals/Receive/index.js
@@ -12,6 +12,8 @@ import Track from 'analytics/Track'
 import type { Account } from '@ledgerhq/live-common/lib/types'
 
 import { MODAL_RECEIVE } from 'config/constants'
+import { openURL } from 'helpers/linking'
+import { urls } from 'config/support'
 import type { T, Device } from 'types/common'
 import type { StepProps as DefaultStepProps } from 'components/base/Stepper'
 
@@ -56,6 +58,7 @@ export type StepProps = DefaultStepProps & {
   onChangeAccount: (?Account) => void,
   onChangeAppOpened: boolean => void,
   onChangeAddressVerified: (?boolean, ?Error) => void,
+  contactUs: () => void,
 }
 
 const createSteps = ({ t }: { t: T }) => [
@@ -129,7 +132,9 @@ class ReceiveModal extends PureComponent<Props, State> {
       isAddressVerified: null,
       isAppOpened: false,
     })
-
+  handleContactUs = () => {
+    openURL(urls.receiveFlowContactSupport)
+  }
   handleReset = () => this.setState({ ...INITIAL_STATE })
 
   handleCloseModal = () => this.props.closeModal(MODAL_RECEIVE)
@@ -182,6 +187,7 @@ class ReceiveModal extends PureComponent<Props, State> {
       onChangeAccount: this.handleChangeAccount,
       onChangeAppOpened: this.handleChangeAppOpened,
       onChangeAddressVerified: this.handleChangeAddressVerified,
+      contactUs: this.handleContactUs,
     }
 
     const errorSteps = verifyAddressError
diff --git a/src/components/modals/Receive/steps/03-step-confirm-address.js b/src/components/modals/Receive/steps/03-step-confirm-address.js
index a1ddca5f..4e496999 100644
--- a/src/components/modals/Receive/steps/03-step-confirm-address.js
+++ b/src/components/modals/Receive/steps/03-step-confirm-address.js
@@ -47,11 +47,11 @@ export default class StepConfirmAddress extends PureComponent<StepProps> {
   }
 }
 
-export function StepConfirmAddressFooter({ t, transitionTo, onRetry }: StepProps) {
+export function StepConfirmAddressFooter({ t, transitionTo, onRetry, contactUs }: StepProps) {
   // This will be displayed only if user rejected address
   return (
     <Fragment>
-      <Button event="Receive Flow Step 3 Contact Us Clicked">
+      <Button onClick={contactUs} event="Receive Flow Step 3 Contact Us Clicked">
         {t('app:receive.steps.confirmAddress.support')}
       </Button>
       <Button
diff --git a/src/config/support.js b/src/config/support.js
index bd93d169..062df717 100644
--- a/src/config/support.js
+++ b/src/config/support.js
@@ -14,4 +14,7 @@ export const urls = {
     'https://support.ledgerwallet.com/hc/en-us/requests/new?ticket_form_id=248165',
   feesMoreInfo: 'https://support.ledgerwallet.com/hc/en-us/articles/360006535873',
   recipientAddressInfo: 'https://support.ledgerwallet.com/hc/en-us/articles/360006433934',
+  // should join and generalize naming for the same urls once defined
+  receiveFlowContactSupport:
+    'https://support.ledgerwallet.com/hc/en-us/requests/new?ticket_form_id=248165',
 }