simplify selectiveUnions

Author: GuillaumeRx

packages/snaps-sdk/src/types/handlers/assets-lookup.ts

@@ -17,7 +17,6 @@ import {
   CaipAccountIdStruct,
   CaipAssetTypeOrIdStruct,
   assert,
-  hasProperty,
   isObject,
 } from '@metamask/utils';
 import type { CaipAssetTypeOrId } from '@metamask/utils';
@@ -80,11 +79,7 @@ export const NonFungibleAssetMetadataStruct = object({
 });
 
 export const AssetMetadataStruct = selectiveUnion((metadata) => {
-  if (!isObject(metadata) || !hasProperty(metadata, 'fungible')) {
-    return union([FungibleAssetMetadataStruct, NonFungibleAssetMetadataStruct]);
-  }
-
-  if (metadata.fungible) {
+  if (isObject(metadata) && metadata.fungible) {
     return FungibleAssetMetadataStruct;
   }
 

packages/snaps-utils/src/handlers/assets-market-data.ts

@@ -12,7 +12,6 @@ import {
 import {
   CaipAssetTypeOrIdStruct,
   CaipAssetTypeStruct,
-  hasProperty,
   isObject,
 } from '@metamask/utils';
 
@@ -72,14 +71,7 @@ export const NonFungibleAssetMarketDataStruct = object({
  * A struct representing the market data for an asset, which can be either fungible or non-fungible.
  */
 export const AssetMarketDataStruct = selectiveUnion((marketData) => {
-  if (!isObject(marketData) || !hasProperty(marketData, 'fungible')) {
-    return union([
-      FungibleAssetMarketDataStruct,
-      NonFungibleAssetMarketDataStruct,
-    ]);
-  }
-
-  if (marketData.fungible) {
+  if (isObject(marketData) && marketData.fungible) {
     return FungibleAssetMarketDataStruct;
   }