From 501cc3120257079698c2b8d08fb96fbfb7179995 Mon Sep 17 00:00:00 2001 From: Ethan Wessel Date: Fri, 26 Feb 2021 17:12:15 -0800 Subject: [PATCH 1/5] Switch Naming of Metrics --- app/util/analytics.js | 57 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/app/util/analytics.js b/app/util/analytics.js index 60598cde7e1..c527ad51e8f 100644 --- a/app/util/analytics.js +++ b/app/util/analytics.js @@ -110,21 +110,7 @@ const NAMES = { WALLET_BUY_ETH: 'Buy ETH', PAYMENTS_SELECTS_DEBIT_OR_ACH: 'Selects debit card or bank account as payment method', PAYMENTS_SELECTS_APPLE_PAY: 'Selects Apple Pay as payment method', - - // Swaps - SWAPS_OPENED: 'Swaps Opened', - SWAP_TRACKING_FAILED: 'Swap Tracking failed', - QUOTES_REQUESTED: 'Quotes Requested', - QUOTES_RECEIVED: 'Quotes Received', - QUOTES_REQUEST_CANCELLED: 'Quotes Request Cancelled', - ALL_AVAILABLE_QUOTES_OPENED: 'All Available Quotes Opened', - SWAP_STARTED: 'Swap Started', - SWAP_COMPLETED: 'Swap Completed', - SWAP_FAILED: 'Swap Failed', - QUOTES_TIMED_OUT: 'Quotes Timed Out', - NO_QUOTES_AVAILABLE: 'No Quotes Available', - GAS_FEES_CHANGED: 'Gas Fees Changed', - EDIT_SPEND_LIMIT_OPENED: 'Edit Spend Limit Opened' + SWAPS: 'Swaps' }; const ACTIONS = { @@ -190,7 +176,20 @@ const CATEGORIES = { DAPP_INTERACTIONS: 'Dapp Interactions', WALLET: 'Wallet', PAYMENTS: 'Payments', - SWAPS: 'Swaps' + // Swaps + SWAPS_OPENED: 'Swaps Opened', + SWAP_TRACKING_FAILED: 'Swap Tracking failed', + QUOTES_REQUESTED: 'Quotes Requested', + QUOTES_RECEIVED: 'Quotes Received', + QUOTES_REQUEST_CANCELLED: 'Quotes Request Cancelled', + ALL_AVAILABLE_QUOTES_OPENED: 'All Available Quotes Opened', + SWAP_STARTED: 'Swap Started', + SWAP_COMPLETED: 'Swap Completed', + SWAP_FAILED: 'Swap Failed', + QUOTES_TIMED_OUT: 'Quotes Timed Out', + NO_QUOTES_AVAILABLE: 'No Quotes Available', + GAS_FEES_CHANGED: 'Gas Fees Changed', + EDIT_SPEND_LIMIT_OPENED: 'Edit Spend Limit Opened' }; export const ANALYTICS_EVENT_OPTS = { @@ -514,17 +513,17 @@ export const ANALYTICS_EVENT_OPTS = { NAMES.PAYMENTS_SELECTS_APPLE_PAY ), // Swaps - SWAPS_OPENED: generateOpt(CATEGORIES.SWAPS, ACTIONS.SWAP, NAMES.SWAPS_OPENED), - QUOTES_REQUESTED: generateOpt(CATEGORIES.SWAPS, ACTIONS.QUOTE, NAMES.QUOTES_REQUESTED), - QUOTES_RECEIVED: generateOpt(CATEGORIES.SWAPS, ACTIONS.QUOTE, NAMES.QUOTES_RECEIVED), - QUOTES_REQUEST_CANCELLED: generateOpt(CATEGORIES.SWAPS, ACTIONS.QUOTE, NAMES.QUOTES_REQUEST_CANCELLED), - ALL_AVAILABLE_QUOTES_OPENED: generateOpt(CATEGORIES.SWAPS, ACTIONS.QUOTE, NAMES.ALL_AVAILABLE_QUOTES_OPENED), - SWAP_STARTED: generateOpt(CATEGORIES.SWAPS, ACTIONS.SWAP, NAMES.SWAP_STARTED), - SWAP_COMPLETED: generateOpt(CATEGORIES.SWAPS, ACTIONS.SWAP, NAMES.SWAP_COMPLETED), - SWAP_FAILED: generateOpt(CATEGORIES.SWAPS, ACTIONS.SWAP, NAMES.SWAP_FAILED), - SWAP_TRACKING_FAILED: generateOpt(CATEGORIES.SWAPS, ACTIONS.SWAP, NAMES.SWAP_TRACKING_FAILED), - QUOTES_TIMED_OUT: generateOpt(CATEGORIES.SWAPS, ACTIONS.QUOTE, NAMES.QUOTES_TIMED_OUT), - NO_QUOTES_AVAILABLE: generateOpt(CATEGORIES.SWAPS, ACTIONS.QUOTE, NAMES.NO_QUOTES_AVAILABLE), - GAS_FEES_CHANGED: generateOpt(CATEGORIES.SWAPS, ACTIONS.QUOTE, NAMES.GAS_FEES_CHANGED), - EDIT_SPEND_LIMIT_OPENED: generateOpt(CATEGORIES.SWAPS, ACTIONS.QUOTE, NAMES.EDIT_SPEND_LIMIT_OPENED) + SWAPS_OPENED: generateOpt(CATEGORIES.SWAPS_OPENED, ACTIONS.SWAP, NAMES.SWAPS), + QUOTES_REQUESTED: generateOpt(CATEGORIES.QUOTES_REQUESTED, ACTIONS.QUOTE, NAMES.SWAPS), + QUOTES_RECEIVED: generateOpt(CATEGORIES.QUOTES_RECEIVED, ACTIONS.QUOTE, NAMES.SWAPS), + QUOTES_REQUEST_CANCELLED: generateOpt(CATEGORIES.QUOTES_REQUEST_CANCELLED, ACTIONS.QUOTE, NAMES.SWAPS), + ALL_AVAILABLE_QUOTES_OPENED: generateOpt(CATEGORIES.ALL_AVAILABLE_QUOTES_OPENED, ACTIONS.QUOTE, NAMES.SWAPS), + SWAP_STARTED: generateOpt(CATEGORIES.SWAP_STARTED, ACTIONS.SWAP, NAMES.SWAPS), + SWAP_COMPLETED: generateOpt(CATEGORIES.SWAP_COMPLETED, ACTIONS.SWAP, NAMES.SWAPS), + SWAP_FAILED: generateOpt(CATEGORIES.SWAP_FAILED, ACTIONS.SWAP, NAMES.SWAPS), + SWAP_TRACKING_FAILED: generateOpt(CATEGORIES.SWAP_TRACKING_FAILED, ACTIONS.SWAP, NAMES.SWAPS), + QUOTES_TIMED_OUT: generateOpt(CATEGORIES.QUOTES_TIMED_OUT, ACTIONS.QUOTE, NAMES.SWAPS), + NO_QUOTES_AVAILABLE: generateOpt(CATEGORIES.NO_QUOTES_AVAILABLE, ACTIONS.QUOTE, NAMES.SWAPS), + GAS_FEES_CHANGED: generateOpt(CATEGORIES.GAS_FEES_CHANGED, ACTIONS.QUOTE, NAMES.SWAPS), + EDIT_SPEND_LIMIT_OPENED: generateOpt(CATEGORIES.EDIT_SPEND_LIMIT_OPENED, ACTIONS.QUOTE, NAMES.SWAPS) }; From ed7c90dafba37ef3336c834ebd67e283c178150a Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Mon, 1 Mar 2021 12:37:40 -0300 Subject: [PATCH 2/5] REVERTTHIS --- app/core/Analytics.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/core/Analytics.js b/app/core/Analytics.js index 0080d881c4c..fdeee3bfd58 100644 --- a/app/core/Analytics.js +++ b/app/core/Analytics.js @@ -43,16 +43,16 @@ class Analytics { */ _trackEvent(name, { event, params = {}, value, info }) { if (!this.enabled) return; - if (!__DEV__) { - RCTAnalytics.trackEvent({ - ...event, - ...params, - value, - info - }); - } else { - Logger.log(`Analytics '${name}' -`, event, params, value, info); - } + // if (!__DEV__) { + RCTAnalytics.trackEvent({ + ...event, + ...params, + value, + info + }); + // } else { + Logger.log(`Analytics '${name}' -`, event, params, value, info); + // } } /** From 6c130fc22809c07cbf3941706d4998d7210f4205 Mon Sep 17 00:00:00 2001 From: Ethan Wessel Date: Mon, 1 Mar 2021 08:54:51 -0800 Subject: [PATCH 3/5] Revert "REVERTTHIS" This reverts commit ed7c90dafba37ef3336c834ebd67e283c178150a. --- app/core/Analytics.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/core/Analytics.js b/app/core/Analytics.js index fdeee3bfd58..0080d881c4c 100644 --- a/app/core/Analytics.js +++ b/app/core/Analytics.js @@ -43,16 +43,16 @@ class Analytics { */ _trackEvent(name, { event, params = {}, value, info }) { if (!this.enabled) return; - // if (!__DEV__) { - RCTAnalytics.trackEvent({ - ...event, - ...params, - value, - info - }); - // } else { - Logger.log(`Analytics '${name}' -`, event, params, value, info); - // } + if (!__DEV__) { + RCTAnalytics.trackEvent({ + ...event, + ...params, + value, + info + }); + } else { + Logger.log(`Analytics '${name}' -`, event, params, value, info); + } } /** From c8ddd46b714e5138cada37bc89666609d2022283 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Mon, 1 Mar 2021 14:17:55 -0300 Subject: [PATCH 4/5] rmcomment --- app/core/Analytics.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/core/Analytics.js b/app/core/Analytics.js index 0080d881c4c..db3b24ccde2 100644 --- a/app/core/Analytics.js +++ b/app/core/Analytics.js @@ -63,10 +63,10 @@ class Analytics { this.enabled = enabled; this.listeners = []; Analytics.instance = this; - // if (!__DEV__) { - RCTAnalytics.optIn(this.enabled); - this._peopleIdentify(); - // } + if (!__DEV__) { + RCTAnalytics.optIn(this.enabled); + this._peopleIdentify(); + } } return Analytics.instance; } From 87963ebf3afd03c48afdb87dd749c4f72bb18bec Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Mon, 1 Mar 2021 17:12:59 -0300 Subject: [PATCH 5/5] SWAP_TRACKING_FAILED --- app/util/analytics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/analytics.js b/app/util/analytics.js index c527ad51e8f..c4863b4852c 100644 --- a/app/util/analytics.js +++ b/app/util/analytics.js @@ -178,7 +178,7 @@ const CATEGORIES = { PAYMENTS: 'Payments', // Swaps SWAPS_OPENED: 'Swaps Opened', - SWAP_TRACKING_FAILED: 'Swap Tracking failed', + SWAP_TRACKING_FAILED: 'Swap Tracking Failed', QUOTES_REQUESTED: 'Quotes Requested', QUOTES_RECEIVED: 'Quotes Received', QUOTES_REQUEST_CANCELLED: 'Quotes Request Cancelled',