fix(predict): infer type from schema

Author: matallui

app/components/UI/Predict/schemas/common.test.ts

@@ -1,70 +1,70 @@
 import { create, StructError } from '@metamask/superstruct';
-import { Hex } from './common';
+import { HexSchema } from './common';
 
 describe('Hex schema', () => {
   it('validates a string starting with 0x', () => {
     const input = '0xabc123';
 
-    const result = create(input, Hex);
+    const result = create(input, HexSchema);
 
     expect(result).toBe('0xabc123');
   });
 
   it('validates a minimal 0x string', () => {
     const input = '0x';
 
-    const result = create(input, Hex);
+    const result = create(input, HexSchema);
 
     expect(result).toBe('0x');
   });
 
   it('validates a full-length Ethereum address', () => {
     const input = '0xe6a2026d58eaff3c7ad7ba9386fb143388002382';
 
-    const result = create(input, Hex);
+    const result = create(input, HexSchema);
 
     expect(result).toBe('0xe6a2026d58eaff3c7ad7ba9386fb143388002382');
   });
 
   it('throws for a string without 0x prefix', () => {
     const input = 'abc123';
 
-    expect(() => create(input, Hex)).toThrow(StructError);
+    expect(() => create(input, HexSchema)).toThrow(StructError);
   });
 
   it('throws for an empty string', () => {
     const input = '';
 
-    expect(() => create(input, Hex)).toThrow(StructError);
+    expect(() => create(input, HexSchema)).toThrow(StructError);
   });
 
   it('throws for a number value', () => {
     const input = 123;
 
-    expect(() => create(input, Hex)).toThrow(StructError);
+    expect(() => create(input, HexSchema)).toThrow(StructError);
   });
 
   it('throws for null', () => {
     const input = null;
 
-    expect(() => create(input, Hex)).toThrow(StructError);
+    expect(() => create(input, HexSchema)).toThrow(StructError);
   });
 
   it('throws for undefined', () => {
     const input = undefined;
 
-    expect(() => create(input, Hex)).toThrow(StructError);
+    expect(() => create(input, HexSchema)).toThrow(StructError);
   });
 
   it('throws for a boolean value', () => {
     const input = true;
 
-    expect(() => create(input, Hex)).toThrow(StructError);
+    expect(() => create(input, HexSchema)).toThrow(StructError);
   });
 
   it('throws for an object', () => {
     const input = { value: '0x123' };
 
-    expect(() => create(input, Hex)).toThrow(StructError);
+    expect(() => create(input, HexSchema)).toThrow(StructError);
   });
 });

app/components/UI/Predict/schemas/common.ts

@@ -1,6 +1,6 @@
 import { define } from '@metamask/superstruct';
 
-export const Hex = define<`0x${string}`>('Hex', (value) => {
+export const HexSchema = define<`0x${string}`>('Hex', (value) => {
   if (typeof value !== 'string') {
     return false;
   }

app/components/UI/Predict/schemas/flags.ts

@@ -6,13 +6,16 @@ import {
   object,
   string,
 } from '@metamask/superstruct';
-import { Hex } from './common';
+import { HexSchema } from './common';
 import { DEFAULT_FEE_COLLECTION_FLAG } from '../constants/flags';
 
 export const PredictFeeCollectionSchema = defaulted(
   object({
     enabled: defaulted(boolean(), () => DEFAULT_FEE_COLLECTION_FLAG.enabled),
-    collector: defaulted(Hex, () => DEFAULT_FEE_COLLECTION_FLAG.collector),
+    collector: defaulted(
+      HexSchema,
+      () => DEFAULT_FEE_COLLECTION_FLAG.collector,
+    ),
     metamaskFee: defaulted(
       number(),
       () => DEFAULT_FEE_COLLECTION_FLAG.metamaskFee,

app/components/UI/Predict/schemas/index.ts

@@ -1,2 +1,2 @@
-export { Hex } from './common';
+export { HexSchema } from './common';
 export { PredictFeeCollectionSchema } from './flags';

app/components/UI/Predict/types/flags.ts

@@ -1,15 +1,8 @@
-import type { Hex } from '@metamask/utils';
+import { Infer } from '@metamask/superstruct';
+import { PredictFeeCollectionSchema } from '../schemas';
 import { VersionGatedFeatureFlag } from '../../../../util/remoteFeatureFlag';
 
-export interface PredictFeeCollection {
-  enabled: boolean;
-  collector: Hex;
-  metamaskFee: number;
-  providerFee: number;
-  waiveList: string[];
-  executors?: string[];
-  permit2Enabled?: boolean;
-}
+export type PredictFeeCollection = Infer<typeof PredictFeeCollectionSchema>;
 
 export interface PredictLiveSportsFlag {
   enabled: boolean;