fix(Api): better names for metrics

Author: Justin Tormey

src/api.js

@@ -309,11 +309,9 @@ API.prototype.incrementLoginViaQrStats = function () {
 };
 
 API.prototype.incrementBtcEthUsageStats = function (btcBalance, ethBalance) {
-  let base = this.ROOT_URL + 'event?name=wallet_login_balance_';
-  let makeEventUrl = (curr, cond) => base + curr + '_' + (cond ? 1 : 0);
-  fetch(makeEventUrl('btc', btcBalance > 0));
-  fetch(makeEventUrl('eth', ethBalance > 0));
-  fetch(makeEventUrl('btceth', btcBalance > 0 && ethBalance > 0));
+  let base = this.ROOT_URL + 'event?name=wallet_login_balance';
+  let makeEventUrl = (btc, eth) => `${base}_btc_${btc ? 1 : 0}_eth_${eth ? 1 : 0}`;
+  fetch(makeEventUrl(btcBalance > 0, ethBalance > 0));
 };
 
 API.prototype.getBlockchainAddress = function () {

tests/api_spec.js

@@ -26,37 +26,29 @@ describe('API', () => {
       spyOn(window, 'fetch')
     })
 
-    it('should make three requests, one for each stat', () => {
+    it('should make one request', () => {
       API.incrementBtcEthUsageStats(0, 0)
-      expect(window.fetch).toHaveBeenCalledTimes(3)
+      expect(window.fetch).toHaveBeenCalledTimes(1)
     })
 
     it('should record correctly for btc=0, eth=0', () => {
       API.incrementBtcEthUsageStats(0, 0)
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btc_0'))
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('eth_0'))
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btceth_0'))
+      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btc_0_eth_0'))
     })
 
     it('should record correctly for btc>0, eth=0', () => {
       API.incrementBtcEthUsageStats(1, 0)
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btc_1'))
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('eth_0'))
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btceth_0'))
+      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btc_1_eth_0'))
     })
 
     it('should record correctly for btc=0, eth>0', () => {
       API.incrementBtcEthUsageStats(0, 1)
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btc_0'))
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('eth_1'))
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btceth_0'))
+      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btc_0_eth_1'))
     })
 
     it('should record correctly for btc>0, eth>0', () => {
       API.incrementBtcEthUsageStats(1, 1)
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btc_1'))
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('eth_1'))
-      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btceth_1'))
+      expect(window.fetch).toHaveBeenCalledWith(eventUrl('btc_1_eth_1'))
     })
   })
 });