Merge pull request #440 from torusresearch/fix/rt-to-t

fix: rt to t
torusresearch · Sep 22, 2023 · ba0a504 · ba0a504
2 parents c858c22 + 5df71a9
commit ba0a504
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/src/modules/controllers.ts b/src/modules/controllers.ts
@@ -29,6 +29,7 @@ import { ExtendedAddressPreferences, LoadingState, NFTInfo, SolanaToken, SolanaT
 import { BigNumber } from "bignumber.js";
 import { cloneDeep, merge, omit } from "lodash-es";
 import log from "loglevel";
+import { VueI18nTranslation } from "vue-i18n";
 // import { useI18n } from "vue-i18n";
 import { Action, getModule, Module, Mutation, VuexModule } from "vuex-module-decorators";
 
@@ -289,15 +290,15 @@ class ControllerModule extends VuexModule {
 
   @Action
   public async setCrashReport(status: boolean): Promise<void> {
-    const { rt } = i18n.global;
+    const t = i18n.global.t as VueI18nTranslation;
     const isSet = await this.torus.setCrashReport(status);
     if (isSet) {
       if (storageAvailable("localStorage")) {
         localStorage.setItem("torus-enable-crash-reporter", String(status));
       }
-      this.handleSuccess(rt(NAVBAR_MESSAGES.success.CRASH_REPORT_SUCCESS));
+      this.handleSuccess(t(NAVBAR_MESSAGES.success.CRASH_REPORT_SUCCESS));
     } else {
-      this.handleError(rt(NAVBAR_MESSAGES.error.CRASH_REPORT_FAILED));
+      this.handleError(t(NAVBAR_MESSAGES.error.CRASH_REPORT_FAILED));
     }
   }
 
@@ -341,25 +342,25 @@ class ControllerModule extends VuexModule {
 
   @Action
   public async addContact(contactPayload: ContactPayload): Promise<void> {
-    const { rt } = i18n.global;
+    const t = i18n.global.t as VueI18nTranslation;
     // const { t } = useI18n({ useScope: "global" });
     const isDeleted = await this.torus.addContact(contactPayload);
     if (isDeleted) {
-      this.handleSuccess(rt(NAVBAR_MESSAGES.success.ADD_CONTACT_SUCCESS));
+      this.handleSuccess(t(NAVBAR_MESSAGES.success.ADD_CONTACT_SUCCESS));
     } else {
-      this.handleError(rt(NAVBAR_MESSAGES.error.ADD_CONTACT_FAILED));
+      this.handleError(t(NAVBAR_MESSAGES.error.ADD_CONTACT_FAILED));
     }
   }
 
   @Action
   public async deleteContact(contactId: number): Promise<void> {
-    const { rt } = i18n.global;
+    const t = i18n.global.t as VueI18nTranslation;
     // const { t } = useI18n({ useScope: "global" });
     const isDeleted = await this.torus.deleteContact(contactId);
     if (isDeleted) {
-      this.handleSuccess(rt(NAVBAR_MESSAGES.success.DELETE_CONTACT_SUCCESS));
+      this.handleSuccess(t(NAVBAR_MESSAGES.success.DELETE_CONTACT_SUCCESS));
     } else {
-      this.handleError(rt(NAVBAR_MESSAGES.error.DELETE_CONTACT_FAILED));
+      this.handleError(t(NAVBAR_MESSAGES.error.DELETE_CONTACT_FAILED));
     }
   }
 
@@ -384,23 +385,23 @@ class ControllerModule extends VuexModule {
 
   @Action
   public async setCurrency(currency: string): Promise<void> {
-    const { rt } = i18n.global;
+    const t = i18n.global.t as VueI18nTranslation;
     const isSet = await this.torus.setDefaultCurrency(currency);
     if (isSet) {
-      this.handleSuccess(rt(NAVBAR_MESSAGES.success.SET_CURRENCY_SUCCESS));
+      this.handleSuccess(t(NAVBAR_MESSAGES.success.SET_CURRENCY_SUCCESS));
     } else {
-      this.handleError(rt(NAVBAR_MESSAGES.error.SET_CURRENCY_FAILED));
+      this.handleError(t(NAVBAR_MESSAGES.error.SET_CURRENCY_FAILED));
     }
   }
 
   @Action
   public async setLocale(locale: string): Promise<void> {
-    const { rt } = i18n.global;
+    const t = i18n.global.t as VueI18nTranslation;
     const isSet = await this.torus.setLocale(locale);
     if (isSet) {
-      this.handleSuccess(rt(NAVBAR_MESSAGES.success.SET_LOCALE_SUCCESS));
+      this.handleSuccess(t(NAVBAR_MESSAGES.success.SET_LOCALE_SUCCESS));
     } else {
-      this.handleError(rt(NAVBAR_MESSAGES.error.SET_LOCALE_FAILED));
+      this.handleError(t(NAVBAR_MESSAGES.error.SET_LOCALE_FAILED));
     }
   }
 

diff --git a/tests/controller/controllerModule.test.ts b/tests/controller/controllerModule.test.ts
@@ -446,7 +446,7 @@ describe("Controller Module", () => {
       assert.deepStrictEqual(theme, "light");
     });
 
-    it.skip("setCrashReport", async () => {
+    it("setCrashReport", async () => {
       await controllerModule.setCrashReport(true);
       const { crashReport } = controllerModule.torusState.PreferencesControllerState.identities[sKeyPair[0].publicKey.toBase58()];
       assert.deepStrictEqual(crashReport, true);