Merge pull request #3878 from bcgov/feat/3636-E-1

chore(3877): fix readonly type conflicts with Valtio
bcgov · Sep 27, 2024 · 0392c52 · 0392c52
2 parents fbedcc1 + fcb94dc
commit 0392c52
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/app/components/billing/PublicCloudBillingInfo.tsx b/app/components/billing/PublicCloudBillingInfo.tsx
@@ -15,15 +15,12 @@ export default function PublicCloudBillingInfo({
   product,
   className,
 }: {
-  product: Omit<
-    Product & {
-      _permissions?: {
-        signMou: boolean;
-        reviewMou: boolean;
-      };
-    },
-    'providerSelectionReasons' | 'providerSelectionReasonsNote'
-  >;
+  product: Product & {
+    _permissions?: {
+      signMou: boolean;
+      reviewMou: boolean;
+    };
+  };
   className?: string;
 }) {
   const { data: session } = useSession();

diff --git a/app/components/billing/types.ts b/app/components/billing/types.ts
@@ -12,5 +12,5 @@ export type Product = Omit<
       };
     };
   }>,
-  'updatedAt' | 'providerSelectionReasons' | 'providerSelectionReasonsNote'
+  'updatedAt'
 >;
diff --git a/app/helpers/valtio.tsx b/app/helpers/valtio.tsx
@@ -1,6 +1,5 @@
 import { createContext, useContext, useRef } from 'react';
 import { proxy, useSnapshot } from 'valtio';
-import type { Snapshot } from 'valtio/vanilla';
 
 export function createValtioContext<T extends object>(initialState: T) {
   const StateContext = createContext<T>(initialState);
@@ -24,7 +23,7 @@ export function createGlobalValtio<T extends object>(initialState: T) {
 
   const useValtioState = function useValtioState() {
     const snapshot = useSnapshot(state);
-    return [state, snapshot] as [T, Snapshot<T>];
+    return [state, snapshot];
   };
 
   return { state, useValtioState };
@@ -33,5 +32,5 @@ export function createGlobalValtio<T extends object>(initialState: T) {
 export function useValtio<T extends object>(data: T) {
   const state = useRef(proxy<T>(data)).current;
   const snapshot = useSnapshot(state);
-  return [state, snapshot] as [T, Snapshot<T>];
+  return [state, snapshot];
 }