torusresearch · guru-web3 · Sep 25, 2023 · Sep 22, 2023 · Sep 22, 2023 · Sep 22, 2023
diff --git a/.env.production b/.env.production
@@ -5,7 +5,7 @@ VUE_APP_MODE=production
 VUE_APP_SENTRY_SAMPLE_RATE=0.95
 VUE_APP_SENTRY_DSN=https://[email protected]/6125850
 VUE_APP_SOLANA_BUILD_VERSION=0.1
-VUE_APP_GA_ID=G-RCNKR0V6N2
+VUE_APP_GA_ID=GTM-RCNKR0V6N2
 VUE_APP_DEVELOPER_DASHBOARD_URL="https://api.developer.tor.us"
 VUE_APP_IMGPROXY_URL=https://img-cdn.magiceden.dev
 # this signature is for solana.tor.us

diff --git a/.env.testing b/.env.testing
@@ -8,7 +8,7 @@ STATE_DOMAIN=https://solana-openlogin-state.tor.us
 VUE_APP_SENTRY_SAMPLE_RATE=0.95
 VUE_APP_SENTRY_DSN=https://[email protected]/6125850
 VUE_APP_SOLANA_BUILD_VERSION=0.1
-VUE_APP_GA_ID=G-LQ8G005HR9
+VUE_APP_GA_ID=GTM-LQ8G005HR9
 BROWSERSTACK_USERNAME=
 BROWSERSTACK_ACCESS_KEY=
 VUE_APP_DEVELOPER_DASHBOARD_URL="https://api.developer.tor.us"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,8 +41,8 @@
     "@toruslabs/openlogin": "^4.7.0",
     "@toruslabs/openlogin-ed25519": "^2.0.0",
     "@toruslabs/openlogin-jrpc": "^4.7.0",
-    "@toruslabs/openlogin-utils": "^4.7.0",
     "@toruslabs/openlogin-subkey": "^4.2.0",
+    "@toruslabs/openlogin-utils": "^4.7.0",
     "@toruslabs/solana-controllers": "^3.0.3",
     "@toruslabs/tweetnacl-js": "^1.0.4",
     "@toruslabs/vue-components": "^2.0.1",
@@ -64,6 +64,7 @@
     "json-stable-stringify": "^1.0.2",
     "lodash-es": "^4.17.21",
     "loglevel": "^1.8.1",
+    "node-fetch": "^3.3.2",
     "pump": "^3.0.0",
     "qr-scanner": "^1.4.2",
     "readable-stream": "^4.4.2",

diff --git a/src/components/TokenBalance.vue b/src/components/TokenBalance.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { significantDigits } from "@toruslabs/base-controllers";
 import { computed, ref, watch } from "vue";
-import { useI18n } from "vue-i18n";
 
 import { Card, NetworkDisplay } from "@/components/common";
 import ControllerModule from "@/modules/controllers";
+// import { i18n } from "@/plugins/i18nPlugin";
 import { SolAndSplToken } from "@/utils/interfaces";
 
-const { t } = useI18n();
+// const { t } = i18n.global;
 
 const props = defineProps<{
   selectedToken?: Partial<SolAndSplToken>;
@@ -42,7 +42,7 @@ watch(
   <Card>
     <div class="flex w-full justify-between items-center">
       <div class="font-header font-semibold text-app-text-600 dark:text-app-text-dark-500">
-        {{ t("walletHome.totalValue") }}
+        {{ $t("walletHome.totalValue") }}
       </div>
       <NetworkDisplay />
     </div>

diff --git a/src/components/WalletBalance.vue b/src/components/WalletBalance.vue
@@ -1,15 +1,16 @@
 <script setup lang="ts">
 import { LoadingState } from "@toruslabs/solana-controllers";
 import { computed } from "vue";
-import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
 
 import { Button, Card, CurrencySelector, NetworkDisplay } from "@/components/common";
 import { GeneralInteractions, HomePageInteractions, trackUserClick } from "@/directives/google-analytics";
 import ControllerModule from "@/modules/controllers";
+// import { i18n } from "@/plugins/i18nPlugin";
 import { isTopupHidden } from "@/utils/whitelabel";
 
-const { t } = useI18n();
+// const { t } = i18n.global;
+
 const isCurrencyRateUpdate = computed(() => ControllerModule.isCurrencyRateUpdate);
 const isSplTokenLoading = computed(() => ControllerModule.isSplTokenLoading);
 
@@ -37,7 +38,7 @@ const updateCurrency = (newCurrency: string) => {
   <Card :height="showButtons ? '164px' : undefined">
     <div class="flex w-full justify-between items-center">
       <div class="font-header font-semibold text-app-text-600 dark:text-app-text-dark-500">
-        {{ t("walletHome.totalValue") }}
+        {{ $t("walletHome.totalValue") }}
       </div>
       <NetworkDisplay />
     </div>
@@ -71,15 +72,15 @@ const updateCurrency = (newCurrency: string) => {
           variant="tertiary"
           class="w-full mr-3 text-app-primary-500"
           @click="router.push('/wallet/topup')"
-          >{{ t("walletHome.topUp") }}</Button
+          >{{ $t("walletHome.topUp") }}</Button
         >
         <Button
           v-ga="HomePageInteractions.TRANSFER"
           :block="true"
           variant="tertiary"
           class="w-full text-app-primary-500"
           @click="router.push('/wallet/transfer')"
-          >{{ t("walletHome.transfer") }}</Button
+          >{{ $t("walletHome.transfer") }}</Button
         >
       </div>
     </template>

diff --git a/src/components/WalletTabs.vue b/src/components/WalletTabs.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
-import { useI18n } from "vue-i18n";
 
 import SolanaLogoURL from "@/assets/solana-dark.svg";
 import SolanaLightLogoURL from "@/assets/solana-light.svg";
@@ -26,7 +25,6 @@ const props = withDefaults(
   }
 );
 
-const { t } = useI18n();
 const tabs = ref(NAVIGATION_LIST);
 const user = computed(() => ControllerModule.torus.userInfo);
 const selectedAddress = computed(() => ControllerModule.torus.selectedAddress);
@@ -62,7 +60,7 @@ const logout = async () => {
                 value.navHidden && 'hidden',
               ]"
               :aria-current="key === tab ? 'page' : undefined"
-              >{{ t(value.name) }}</router-link
+              >{{ $t(value.name) }}</router-link
             >
           </div>
         </div>
@@ -79,7 +77,7 @@ const logout = async () => {
       <header v-if="props.showHeader">
         <div class="flex items-center max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 flex-wrap">
           <h1 class="text-xl sm:text-3xl font-medium leading-tight text-app-text-500 dark:text-app-text-dark-400">
-            {{ t(tabs[tab]?.title) || "" }}
+            {{ $t(tabs[tab]?.title) || "" }}
           </h1>
           <div class="grow flex">
             <div id="rightPanel" class="w-full" />
@@ -117,7 +115,7 @@ const logout = async () => {
             class="text-xs text-center leading-none mt-1"
             :class="[key === tab ? (ControllerModule.isDarkMode ? 'item-white' : 'item-black') : 'item-gray opacity-90']"
           >
-            {{ t(value.name) || "" }}
+            {{ $t(value.name) || "" }}
           </p>
         </div>
       </router-link>

diff --git a/src/components/activity/ActivityItem.vue b/src/components/activity/ActivityItem.vue
@@ -3,7 +3,6 @@ import { ACTIVITY_STATUS_CANCELLED, ACTIVITY_STATUS_SUCCESSFUL, ACTIVITY_STATUS_
 import { SolanaTransactionActivity } from "@toruslabs/solana-controllers";
 import dateFormat from "dateformat";
 import { computed } from "vue";
-import { useI18n } from "vue-i18n";
 
 import SolanaLogoDark from "@/assets/solana-logo-shaded.png";
 import SolanaLogoLight from "@/assets/solana-logo-shaded-light.png";
@@ -17,8 +16,6 @@ const props = defineProps<{
 // const selectedNetworkDisplayName = computed(() => ControllerModule.selectedNetworkDisplayName);
 // const showDetails = ref(false);
 
-const { t } = useI18n();
-
 const openExplorerLink = (link: string) => {
   trackUserClick(ActivityPageInteractions.ACTIVITY_DETAIL + link);
   window.open(link, "_blank");
@@ -68,16 +65,16 @@ const amountIsVisible = computed(() => {
         </div>
         <div class="text-left ml-4 break-words overflow-hidden">
           <div v-if="activity.type === 'unknown'" class="text-xs font-medium text-app-text-600 dark:text-app-text-dark-600">
-            {{ t("walletActivity.unknown") }}
+            {{ $t("walletActivity.unknown") }}
           </div>
           <!-- Transfer Instruction -->
           <div v-if="['transfer', 'transferChecked'].includes(activity.type)">
             <div class="text-xs font-medium text-app-text-600 dark:text-app-text-dark-600">
-              {{ activity.send ? t("walletActivity.sent") : t("walletActivity.received") }} {{ " " }} {{ Number(activity.totalAmountString) }}
+              {{ activity.send ? $t("walletActivity.sent") : $t("walletActivity.received") }} {{ " " }} {{ Number(activity.totalAmountString) }}
               {{ activity.cryptoCurrency }}
 
               <span v-if="activity.cryptoCurrency === 'SOL'" class="text-xxs text-app-text-400 dark:text-app-text-dark-600"
-                >{{ activity.send ? t("walletActivity.to") : t("walletActivity.from") }} {{ " " }}</span
+                >{{ activity.send ? $t("walletActivity.to") : $t("walletActivity.from") }} {{ " " }}</span
               >
             </div>
             <div v-if="activity.cryptoCurrency === 'SOL'" class="text-xs text-app-text-400 dark:text-app-text-dark-600 break-words">
@@ -90,7 +87,7 @@ const amountIsVisible = computed(() => {
               Burnt {{ Number(activity.totalAmountString) }} {{ activity.cryptoCurrency }}
 
               <span v-if="activity.cryptoCurrency === 'SOL'" class="text-xxs text-app-text-400 dark:text-app-text-dark-600"
-                >{{ activity.send ? t("walletActivity.to") : t("walletActivity.from") }} {{ " " }}</span
+                >{{ activity.send ? $t("walletActivity.to") : $t("walletActivity.from") }} {{ " " }}</span
               >
             </div>
             <div v-if="activity.cryptoCurrency === 'SOL'" class="text-xs text-app-text-400 dark:text-app-text-dark-600 break-words">
@@ -122,7 +119,7 @@ const amountIsVisible = computed(() => {
     <!-- status -->
     <div class="col-span-4 text-right order-4 flex items-center justify-end sm:col-span-2" :class="{ 'sm:col-span-4': !amountIsVisible }">
       <div class="rounded-xl inline-block bg-green-300 text-xs text-center py-1 px-5" :style="{ backgroundColor: getTxStatusColor(activity.status) }">
-        {{ t(`walletActivity.${activity.status}`) }}
+        {{ $t(`walletActivity.${activity.status}`) }}
       </div>
     </div>
   </div>

diff --git a/src/components/burnNFT/BurnNFT.vue b/src/components/burnNFT/BurnNFT.vue
@@ -2,7 +2,6 @@
 import { Dialog, DialogOverlay, DialogTitle, TransitionChild, TransitionRoot } from "@headlessui/vue";
 import { NFTInfo } from "@toruslabs/solana-controllers";
 import { ref } from "vue";
-import { useI18n } from "vue-i18n";
 
 import FallbackNft from "@/assets/fallback-nft.svg";
 import { Button } from "@/components/common";
@@ -29,8 +28,6 @@ const props = withDefaults(
   }
 );
 
-const { t } = useI18n();
-
 const emits = defineEmits(["transferConfirm", "transferReject", "onCloseModal"]);
 
 const closeModal = () => {
@@ -88,7 +85,7 @@ const refDiv = ref(null);
               </div>
               <div class="flex flex-row items-center my-6 mx-3">
                 <Button class="flex-auto mx-2 w-1/2" :block="true" variant="tertiary" @click="onCancel">
-                  {{ t("walletTransfer.cancel") }}
+                  {{ $t("walletTransfer.cancel") }}
                 </Button>
                 <button
                   type="button"

diff --git a/src/components/common/ComboBox.vue b/src/components/common/ComboBox.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { ErrorObject } from "@vuelidate/core";
 import { computed, ref } from "vue";
-import { useI18n } from "vue-i18n";
 
 type ItemType = { text: string; value: string };
 
@@ -33,8 +32,6 @@ const filteredItems = computed(() => {
   });
 });
 
-const { t } = useI18n();
-
 const setSelectedItem = (item: ItemType) => {
   value.value = item.value;
   isListOpen.value = false;
@@ -51,7 +48,7 @@ const onBlur = () => {
   <div class="flex flex-col">
     <div v-show="filteredItems.length > 0 && isListOpen" class="absolute inset-0 z-0" @click="isListOpen = false" @keydown="isListOpen = false"></div>
 
-    <div class="text-sm mb-1 text-app-text-600 dark:text-app-text-dark-500">{{ t("walletActivity.sendTo") }}</div>
+    <div class="text-sm mb-1 text-app-text-600 dark:text-app-text-dark-500">{{ $t("walletActivity.sendTo") }}</div>
     <input
       v-model="value"
       type="text"

diff --git a/src/components/common/CurrencySelector.vue b/src/components/common/CurrencySelector.vue
@@ -10,7 +10,7 @@ const props = defineProps<{
   token: string;
 }>();
 
-const currencies = computed(() => supportedCurrencies(props.token.toUpperCase()));
+const currencies = computed(() => supportedCurrencies());
 const emits = defineEmits(["onChange"]);
 
 const value = computed({