Merge pull request #1957 from GW2Treasures/feature/refactor-gw2-data-…

…subscriptions

Refactor gw2 data subscriptions

apps/web/app/[language]/achievement/[id]/tier-table.tsx

@@ -9,7 +9,7 @@ import type { Gw2Account } from '@/components/Gw2Api/types';
 import { Skeleton } from '@/components/Skeleton/Skeleton';
 import { ProgressCell } from '@/components/Achievement/ProgressCell';
 import { AchievementPoints } from '@/components/Achievement/AchievementPoints';
-import { useSubscription } from '@/components/Gw2Api/Gw2AccountSubscriptionProvider';
+import { useSubscription } from '@/components/Gw2Api/use-gw2-subscription';
 import { Scope } from '@gw2me/client';
 import { Tip } from '@gw2treasures/ui/components/Tip/Tip';
 import { Table } from '@gw2treasures/ui/components/Table/Table';

apps/web/app/[language]/currency/[id]/wallet-table.tsx

@@ -2,7 +2,7 @@
 
 import type { FC } from 'react';
 import { CurrencyValue } from '@/components/Currency/CurrencyValue';
-import { useSubscription } from '@/components/Gw2Api/Gw2AccountSubscriptionProvider';
+import { useSubscription } from '@/components/Gw2Api/use-gw2-subscription';
 import type { Gw2Account } from '@/components/Gw2Api/types';
 import { Skeleton } from '@/components/Skeleton/Skeleton';
 import { Scope } from '@gw2me/client';

apps/web/app/[language]/currency/account-data.tsx

@@ -3,7 +3,7 @@
 import type { FC } from 'react';
 import { useGw2Accounts } from '@/components/Gw2Api/use-gw2-accounts';
 import { Scope } from '@gw2me/client';
-import { useSubscription } from '@/components/Gw2Api/Gw2AccountSubscriptionProvider';
+import { useSubscription } from '@/components/Gw2Api/use-gw2-subscription';
 import { Skeleton } from '@/components/Skeleton/Skeleton';
 import { CurrencyValue } from '@/components/Currency/CurrencyValue';
 import { Gw2AccountName } from '@/components/Gw2Api/Gw2AccountName';

apps/web/app/[language]/dashboard/dashboard.tsx

@@ -10,7 +10,7 @@ import { Headline } from '@gw2treasures/ui/components/Headline/Headline';
 import { useInventoryItemTotal } from '@/components/Inventory/use-inventory';
 import { Skeleton } from '@/components/Skeleton/Skeleton';
 import { Scope } from '@gw2me/client';
-import { useSubscription } from '@/components/Gw2Api/Gw2AccountSubscriptionProvider';
+import { useSubscription } from '@/components/Gw2Api/use-gw2-subscription';
 import { CurrencyValue } from '@/components/Currency/CurrencyValue';
 import { ItemLink } from '@/components/Item/ItemLink';
 import { CurrencyLink } from '@/components/Currency/CurrencyLink';

apps/web/app/[language]/homestead/homestead.client.tsx

@@ -2,7 +2,7 @@
 
 import { createContext, useContext, useEffect, useState, type FC, type ReactNode } from 'react';
 import { Scope } from '@gw2me/client';
-import { useSubscription } from '@/components/Gw2Api/Gw2AccountSubscriptionProvider';
+import { useSubscription } from '@/components/Gw2Api/use-gw2-subscription';
 import { Skeleton } from '@/components/Skeleton/Skeleton';
 import { ProgressCell } from '@/components/Achievement/ProgressCell';
 import { Icon } from '@gw2treasures/ui';

apps/web/app/[language]/layout.tsx

@@ -13,7 +13,6 @@ import { ItemTableContext } from '@/components/ItemTable/ItemTableContext';
 import { Gw2ApiProvider } from '@/components/Gw2Api/Gw2ApiProvider';
 import { UserProvider } from '@/components/User/UserProvider';
 import { DataTableContext } from '@gw2treasures/ui/components/Table/DataTableContext';
-import { Gw2AccountSubscriptionProvider } from '@/components/Gw2Api/Gw2AccountSubscriptionProvider';
 import type { ReactNode } from 'react';
 import type { LayoutProps } from '@/lib/next';
 import type { Viewport } from 'next';
@@ -48,10 +47,8 @@ export default async function RootLayout({ children, modal, params }: LayoutProp
               <DataTableContext>
                 <UserProvider>
                   <Gw2ApiProvider>
-                    <Gw2AccountSubscriptionProvider>
-                      <Layout language={language}>{children}</Layout>
-                      {modal}
-                    </Gw2AccountSubscriptionProvider>
+                    <Layout language={language}>{children}</Layout>
+                    {modal}
                   </Gw2ApiProvider>
                 </UserProvider>
               </DataTableContext>

apps/web/app/[language]/wizards-vault/(index)/objectives.tsx

@@ -14,7 +14,7 @@ import styles from './objectives.module.css';
 import { ResetTimer } from '@/components/Reset/ResetTimer';
 import { ProgressCell } from '@/components/Achievement/ProgressCell';
 import { Scope } from '@gw2me/client';
-import { useSubscription } from '@/components/Gw2Api/Gw2AccountSubscriptionProvider';
+import { useSubscription } from '@/components/Gw2Api/use-gw2-subscription';
 import { useGw2Accounts } from '@/components/Gw2Api/use-gw2-accounts';
 import type { Gw2Account } from '@/components/Gw2Api/types';
 import { Waypoint } from '@/components/Waypoint/Waypoint';

apps/web/components/Achievement/AccountAchievementProgress.tsx

@@ -4,7 +4,7 @@ import type { FC } from 'react';
 import { Skeleton } from '../Skeleton/Skeleton';
 import { Icon } from '@gw2treasures/ui';
 import { ProgressCell } from './ProgressCell';
-import { useSubscription } from '../Gw2Api/Gw2AccountSubscriptionProvider';
+import { useSubscription } from '../Gw2Api/use-gw2-subscription';
 import { Scope } from '@gw2me/client';
 import type { Achievement } from '@gw2treasures/database';
 import { Tip } from '@gw2treasures/ui/components/Tip/Tip';