[_]: refactor/cleaning up payments related code

package.json

@@ -9,7 +9,7 @@
     "@iconscout/react-unicons": "^1.1.6",
     "@internxt/css-config": "1.1.0",
     "@internxt/lib": "1.4.1",
-    "@internxt/sdk": "=1.15.13",
+    "@internxt/sdk": "=1.16.1",
     "@internxt/ui": "=0.1.15",
     "@phosphor-icons/react": "^2.1.7",
     "@popperjs/core": "^2.11.6",

src/app/analytics/ga.service.test.ts

@@ -1,8 +1,8 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import gaService from './ga.service';
 import { bytesToString } from 'app/drive/services/size.service';
-import { CouponCodeData } from 'views/Checkout/types';
 import localStorageService from 'services/local-storage.service';
+import { CouponCodeData } from '@internxt/sdk/dist/drive/payments/types/types';
 
 vi.mock('app/drive/services/size.service', () => ({
   bytesToString: vi.fn((bytes) => {
@@ -513,4 +513,4 @@ describe('Testing GA Service', () => {
       });
     });
   });
-});
+});

src/app/analytics/ga.service.ts

@@ -1,7 +1,7 @@
 import { bytesToString } from 'app/drive/services/size.service';
 import { formatPrice } from 'views/Checkout/utils/formatPrice';
 import { getProductAmount } from 'views/Checkout/utils/getProductAmount';
-import { CouponCodeData } from 'views/Checkout/types';
+import { CouponCodeData } from '@internxt/sdk/dist/drive/payments/types/types';
 import envService from 'services/env.service';
 import localStorageService from 'services/local-storage.service';
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
@@ -138,7 +138,7 @@ function trackBeginCheckout(params: TrackBeginCheckoutParams): void {
   }
 }
 
- function trackPurchase(): void {
+function trackPurchase(): void {
   try {
     const userSettings = localStorageService.getUser() as UserSettings;
     if (!userSettings) {

src/app/analytics/googleSheet.service.ts

@@ -1,6 +1,6 @@
 import { PriceWithTax } from '@internxt/sdk/dist/payments/types';
 import envService from 'services/env.service';
-import { CouponCodeData } from 'views/Checkout/types';
+import { CouponCodeData } from '@internxt/sdk/dist/drive/payments/types/types';
 import { getProductAmount } from 'views/Checkout/utils';
 const WINTER_OFFSET_HOUR = 1;
 const TWO_EXTRA_HOURS_IN_MS = 2 * 60 * 60 * 1000;

src/app/analytics/impact.service.ts

@@ -7,7 +7,7 @@ import localStorageService from 'services/local-storage.service';
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import envService from 'services/env.service';
 import { PriceWithTax } from '@internxt/sdk/dist/payments/types';
-import { CouponCodeData } from 'views/Checkout/types';
+import { CouponCodeData } from '@internxt/sdk/dist/drive/payments/types/types';
 import { bytesToString } from 'app/drive/services/size.service';
 import { getProductAmount } from 'views/Checkout/utils';
 import { sendAddShoppersConversion } from './addShoppers.services';

src/app/core/config/views.ts

@@ -21,13 +21,7 @@ import FolderFileNotFound from 'app/drive/views/FolderFileNotFound/FolderFileNot
 import RecentsView from 'views/Recents';
 import RequestAccess from 'app/drive/views/RequestAccess/RequestAccess';
 import TrashView from 'views/Trash';
-import {
-  CheckoutCancelView,
-  CheckoutSessionId,
-  CheckoutSuccessView,
-  CheckoutViewWrapper,
-  PcCloudSuccess,
-} from 'views/Checkout';
+import { CheckoutCancelView, CheckoutSessionId, CheckoutSuccessView, CheckoutViewWrapper } from 'views/Checkout';
 import { ShareFileView, ShareFolderView } from 'views/PublicShared';
 import RedirectToAppView from '../../core/views/RedirectToAppView/RedirectToAppView';
 import SharedViewWrapper from 'views/Shared/SharedViewWrapper';
@@ -58,7 +52,6 @@ const views: Array<{
   { id: AppView.FolderFileNotFound, component: FolderFileNotFound },
   { id: AppView.Deactivation, component: DeactivationView },
   { id: AppView.CheckoutSuccess, component: CheckoutSuccessView },
-  { id: AppView.PcCloudSuccess, component: PcCloudSuccess },
   { id: AppView.CheckoutCancel, component: CheckoutCancelView },
   { id: AppView.CheckoutSession, component: CheckoutSessionId },
   { id: AppView.Checkout, component: CheckoutViewWrapper },

src/app/core/types.ts

@@ -106,7 +106,6 @@ export enum AppView {
   FolderFileNotFound = 'folder-file-not-found',
   Deactivation = 'deactivation',
   CheckoutSuccess = 'checkout-success',
-  PcCloudSuccess = 'pcCloud-success',
   CheckoutCancel = 'checkout-cancel',
   Checkout = 'checkout',
   CheckoutSession = 'checkout-session',

src/app/i18n/locales/de.json

@@ -281,7 +281,8 @@
     "error": {
       "invalidPlan": "Nicht unterstützter Plantyp. Bitte wählen Sie einen gültigen Plan.",
       "fetchingCryptoCurrencies": "Die verfügbaren Kryptowährungsoptionen konnten nicht geladen werden",
-      "addressRequired": "Bitte vervollständigen Sie Ihre Rechnungsadresse, um fortzufahren"
+      "addressRequired": "Bitte vervollständigen Sie Ihre Rechnungsadresse, um fortzufahren",
+      "businessPlan": "Der Unternehmensplan ist nicht verfügbar"
     }
   },
   "general": {

src/app/i18n/locales/en.json

@@ -329,7 +329,8 @@
     "error": {
       "invalidPlan": "Unsupported plan type. Please select a valid plan.",
       "fetchingCryptoCurrencies": "We couldn't load the available cryptocurrency options",
-      "addressRequired": "Please complete your billing address to continue"
+      "addressRequired": "Please complete your billing address to continue",
+      "businessPlan": "Business plan is not available"
     }
   },
   "general": {

src/app/i18n/locales/es.json

@@ -308,7 +308,8 @@
     "error": {
       "invalidPlan": "Tipo de plan no soportado. Por favor, selecciona un plan válido.",
       "fetchingCryptoCurrencies": "No pudimos cargar las opciones de criptomonedas disponibles",
-      "addressRequired": "Por favor, completa tu dirección de facturación para continuar"
+      "addressRequired": "Por favor, completa tu dirección de facturación para continuar",
+      "businessPlan": "El plan de empresa no está disponible"
     }
   },
   "general": {

src/app/i18n/locales/fr.json

@@ -281,7 +281,8 @@
     "error": {
       "invalidPlan": "Type de plan non pris en charge. Veuillez sélectionner un plan valide.",
       "fetchingCryptoCurrencies": "Nous n'avons pas pu charger les options de crypto-monnaies disponibles",
-      "addressRequired": "Veuillez compléter votre adresse de facturation pour continuer"
+      "addressRequired": "Veuillez compléter votre adresse de facturation pour continuer",
+      "businessPlan": "Le plan d’entreprise n’est pas disponible"
     }
   },
   "general": {

src/app/i18n/locales/it.json

@@ -372,7 +372,8 @@
     "error": {
       "invalidPlan": "Tipo di piano non supportato. Seleziona un piano valido.",
       "fetchingCryptoCurrencies": "Non siamo riusciti a caricare le opzioni di criptovalute disponibili",
-      "addressRequired": "Completa il tuo indirizzo di fatturazione per continuare"
+      "addressRequired": "Completa il tuo indirizzo di fatturazione per continuare",
+      "businessPlan": "Il piano aziendale non è disponibile"
     }
   },
   "general": {

src/app/i18n/locales/ru.json

@@ -281,7 +281,8 @@
     "error": {
       "invalidPlan": "Неподдерживаемый тип плана. Пожалуйста, выберите действительный план.",
       "fetchingCryptoCurrencies": "Не удалось загрузить доступные варианты криптовалют",
-      "addressRequired": "Пожалуйста, заполните адрес для выставления счета, чтобы продолжить"
+      "addressRequired": "Пожалуйста, заполните адрес для выставления счета, чтобы продолжить",
+      "businessPlan": "Бизнес-план недоступен"
     }
   },
   "general": {

src/app/i18n/locales/tw.json

@@ -297,7 +297,8 @@
     "error": {
       "invalidPlan": "不支援的方案類型。請選擇有效的方案。",
       "fetchingCryptoCurrencies": "無法載入可用的加密貨幣選項",
-      "addressRequired": "請填寫您的帳單地址以繼續"
+      "addressRequired": "請填寫您的帳單地址以繼續",
+      "businessPlan": "企業計劃不可用"
     }
   },
   "general": {

src/app/i18n/locales/zh.json

@@ -295,7 +295,8 @@
     "error": {
       "invalidPlan": "不支持的套餐类型。请选择有效的套餐。",
       "fetchingCryptoCurrencies": "无法加载可用的加密货币选项",
-      "addressRequired": "请填写您的账单地址以继续"
+      "addressRequired": "请填写您的账单地址以继续",
+      "businessPlan": "企业计划不可用"
     }
   },
   "general": {

src/app/routes/paths.json

@@ -141,13 +141,6 @@
       "exact": false,
       "auth": true
     },
-    {
-      "id": "pcCloud-success",
-      "layout": "empty",
-      "path": "/checkout/pcCloud-success",
-      "exact": false,
-      "auth": true
-    },
     {
       "id": "checkout-cancel",
       "layout": "empty",

src/app/store/index.ts

@@ -2,7 +2,6 @@ import { configureStore } from '@reduxjs/toolkit';
 
 import backupsReducer from '../../views/Backups/store/backupsSlice';
 import planReducer from './slices/plan';
-import productsReducer from './slices/products';
 import referralsReducer from './slices/referrals';
 import sessionReducer from './slices/session';
 import sharedReducer from './slices/sharedLinks';
@@ -20,7 +19,6 @@ export const store = configureStore({
     session: sessionReducer,
     ui: uiReducer,
     plan: planReducer,
-    products: productsReducer,
     backups: backupsReducer,
     taskManager: taskManagerReducer,
     referrals: referralsReducer,

src/services/auth.service.test.ts

@@ -61,11 +61,6 @@ beforeAll(() => {
       initializeThunk: vi.fn(),
     },
   }));
-  vi.mock('app/store/slices/products', () => ({
-    productsThunks: {
-      initializeThunk: vi.fn(),
-    },
-  }));
 
   vi.mock('app/store/slices/referrals', () => ({
     referralsThunks: {

src/services/auth.service.ts

@@ -33,7 +33,6 @@ import {
 import databaseService from 'app/database/services/database.service';
 import { AppDispatch } from 'app/store';
 import { planThunks } from 'app/store/slices/plan';
-import { productsThunks } from 'app/store/slices/products';
 import { initializeUserThunk, userActions, userThunks } from 'app/store/slices/user';
 import { workspaceThunks } from 'app/store/slices/workspaces/workspacesStore';
 import { generateMnemonic, validateMnemonic } from 'bip39';
@@ -584,7 +583,6 @@ export const signUp = async (params: SignUpParams) => {
 
   dispatch(userActions.setUser(user));
   await dispatch(userThunks.initializeUserThunk());
-  dispatch(productsThunks.initializeThunk());
 
   if (!redeemCodeObject) dispatch(planThunks.initializeThunk());
   await trackSignUp(xUser.uuid);
@@ -599,7 +597,6 @@ export const logIn = async (params: LogInParams): Promise<ProfileInfo> => {
   dispatch(userActions.setUser(user));
 
   try {
-    dispatch(productsThunks.initializeThunk());
     dispatch(planThunks.initializeThunk());
     await dispatch(initializeUserThunk())?.unwrap();
     dispatch(workspaceThunks.fetchWorkspaces());

src/services/error.service.test.ts

@@ -35,13 +35,13 @@ describe('Error Service', () => {
       status,
       headers: xRequestId ? { 'x-request-id': xRequestId } : {},
     } as AxiosResponse;
-    return new AxiosResponseError('Request failed with status code ' + status, 'GET /api/test', response);
+    return new AxiosResponseError('Request failed with status code ' + status, 'GET /api/test', response as any);
   };
 
   const createAxiosUnknownError = (message: string, hasRequest: boolean, code?: string): AxiosUnknownError => {
     const axiosErr = new AxiosError(message, code);
     if (hasRequest) (axiosErr as any).request = {};
-    return new AxiosUnknownError(message, 'GET /api/test', axiosErr);
+    return new AxiosUnknownError(message, 'GET /api/test', axiosErr as any);
   };
 
   describe('reportError', () => {