Sending Settings v2 events to Koala

app/src/main/java/com/kickstarter/libs/Koala.java

@@ -3,7 +3,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.kickstarter.extensions.AnswersExtKt;
 import com.kickstarter.libs.utils.KoalaUtils;
 import com.kickstarter.models.Activity;
 import com.kickstarter.models.Project;
@@ -84,6 +83,7 @@ public void trackDiscoveryFilterSelected(final @NonNull DiscoveryParams params)
 
   /**
    * Tracks a project show event.
+   *
    * @param intentRefTag (nullable) The ref tag present in the activity upon displaying the project.
    * @param cookieRefTag (nullable) The ref tag extracted from the cookie store upon viewing the project.
    */
@@ -300,30 +300,25 @@ public void trackSignupNewsletterToggle(final boolean sendNewsletters) {
   // SETTINGS
   public void trackChangedEmail() {
     this.client.track(KoalaEvent.CHANGED_EMAIL);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_EMAIL);
   }
 
   public void trackChangedPassword() {
     this.client.track(KoalaEvent.CHANGED_PASSWORD);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_PASSWORD);
   }
   public void trackContactEmailClicked() {
     this.client.track("Contact Email Clicked");
   }
 
   public void trackDeletePaymentMethod() {
     this.client.track(KoalaEvent.DELETED_PAYMENT_METHOD);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.DELETED_PAYMENT_METHOD);
   }
 
   public void trackErroredDeletePaymentMethod() {
     this.client.track(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD);
   }
 
   public void trackFailedPaymentMethodCreation() {
     this.client.track(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION);
   }
 
   public void trackNewsletterToggle(final boolean sendNewsletter) {
@@ -336,62 +331,54 @@ public void trackNewsletterToggle(final boolean sendNewsletter) {
 
   public void trackResentVerificationEmail() {
     this.client.track(KoalaEvent.RESENT_VERIFICATION_EMAIL);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.RESENT_VERIFICATION_EMAIL);
   }
 
   public void trackSavedPaymentMethod() {
     this.client.track(KoalaEvent.SAVED_PAYMENT_METHOD);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SAVED_PAYMENT_METHOD);
   }
 
-  public void trackSelectedChosenCurrency() {
-    this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SELECTED_CHOSEN_CURRENCY);
+  public void trackSelectedChosenCurrency(final String selectedCurrency) {
+    this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY, new HashMap<String, Object>() {
+      {
+        put("user_chosen_currency", selectedCurrency);
+      }
+    });
   }
 
   public void trackSettingsView() {
     this.client.track("Settings View");
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_SETTINGS);
   }
 
   public void trackViewedAccount() {
     this.client.track(KoalaEvent.VIEWED_ACCOUNT);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ACCOUNT);
   }
 
   public void trackViewedAddNewCard() {
     this.client.track(KoalaEvent.VIEWED_ADD_NEW_CARD);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ADD_NEW_CARD);
   }
 
   public void trackViewedChangedEmail() {
     this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_EMAIL);
   }
 
   public void trackViewedChangedPassword() {
     this.client.track(KoalaEvent.VIEWED_CHANGE_PASSWORD);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_PASSWORD);
   }
 
   public void trackViewedNotifications() {
     this.client.track(KoalaEvent.VIEWED_NOTIFICATIONS);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NOTIFICATIONS);
   }
 
   public void trackViewedNewsletter() {
     this.client.track(KoalaEvent.VIEWED_NEWSLETTER);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NEWSLETTER);
   }
 
   public void trackViewedPaymentMethods() {
     this.client.track(KoalaEvent.VIEWED_PAYMENT_METHODS);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PAYMENT_METHODS);
   }
 
   public void trackViewedPrivacy() {
     this.client.track(KoalaEvent.VIEWED_PRIVACY);
-    AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PRIVACY);
   }
 
   // CHECKOUT

app/src/main/java/com/kickstarter/viewmodels/AccountViewModel.kt

@@ -85,7 +85,7 @@ interface AccountViewModel {
                     .subscribe {
                         this.chosenCurrency.onNext(it)
                         this.success.onNext(it)
-                        this.koala.trackSelectedChosenCurrency()
+                        this.koala.trackSelectedChosenCurrency(it)
                     }
 
             updateCurrencyNotification