chore: Combine Snaps build flags

Author: FrederikBolding

app/components/Approvals/InstallSnapApproval/InstallSnapApproval.constants.ts

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 export const SNAP_INSTALL_FLOW = 'snap-install-flow';
 export const SNAP_INSTALL_OK = 'snap-install-ok';
 ///: END:ONLY_INCLUDE_IF

app/components/Approvals/InstallSnapApproval/InstallSnapApproval.styles.ts

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import { StyleSheet } from 'react-native';
 import { Theme } from '../../../util/theme/models';
 import Device from '../../../util/device';

app/components/Approvals/InstallSnapApproval/InstallSnapApproval.tsx

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import React, { useEffect, useState } from 'react';
 import ApprovalModal from '../ApprovalModal';
 import useApprovalRequest, {
@@ -8,13 +8,9 @@ import { ApprovalTypes } from '../../../core/RPCMethods/RPCMethodMiddleware';
 import { SnapInstallState } from './InstallSnapApproval.types';
 import {
   InstallSnapConnectionRequest,
-  ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
   InstallSnapError,
   InstallSnapPermissionsRequest,
   InstallSnapSuccess,
-  ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
 } from './components';
 import { useSelector } from 'react-redux';
 import { selectSnapsMetadata, getPermissions } from '../../../selectors/snaps';
@@ -33,13 +29,9 @@ const InstallSnapApproval = () => {
   const [installState, setInstallState] = useState<
     SnapInstallState | undefined
   >(undefined);
-  ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
   const [installError, setInstallError] = useState<Error | undefined>(
     undefined,
   );
-  ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
   const {
     approvalRequest,
     onConfirm: rawOnConfirm,
@@ -114,9 +106,6 @@ const InstallSnapApproval = () => {
 
   if (!approvalRequest) return null;
 
-  ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
-
   const onPermissionsConfirm = async () => {
     try {
       await onConfirm(undefined, {
@@ -130,7 +119,7 @@ const InstallSnapApproval = () => {
     }
   };
   ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
 
   if (!approvalRequest || installState === undefined) return null;
 
@@ -161,8 +150,6 @@ const InstallSnapApproval = () => {
             onCancel={onReject}
           />
         );
-      ///: END:ONLY_INCLUDE_IF
-      ///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
       case SnapInstallState.AcceptPermissions:
         return (
           <InstallSnapPermissionsRequest
@@ -184,7 +171,7 @@ const InstallSnapApproval = () => {
           />
         );
       ///: END:ONLY_INCLUDE_IF
-      ///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+      ///: BEGIN:ONLY_INCLUDE_IF(snaps)
       default:
         return null;
     }

app/components/Approvals/InstallSnapApproval/InstallSnapApproval.types.ts

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 interface InstallSnapFlowProps {
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

app/components/Approvals/InstallSnapApproval/components/InstallSnapConnectionRequest/InstallSnapConnectionRequest.constants.ts

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 export const SNAP_INSTALL_CONNECTION_REQUEST =
   'snap-install-connection-request';
 export const SNAP_INSTALL_CANCEL = 'snap-install-cancel';

app/components/Approvals/InstallSnapApproval/components/InstallSnapConnectionRequest/InstallSnapConnectionRequest.tsx

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import React, { useMemo } from 'react';
 import { View } from 'react-native';
 import { InstallSnapFlowProps } from '../../InstallSnapApproval.types';

app/components/Approvals/InstallSnapApproval/components/InstallSnapConnectionRequest/index.ts

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 /* eslint-disable import-x/prefer-default-export */
 import InstallSnapConnectionRequest from './InstallSnapConnectionRequest';
 

app/components/Approvals/InstallSnapApproval/components/InstallSnapError/InstallSnapError.constants.ts

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 const SNAP_INSTALL_ERROR = 'snap-install-error';
 export default SNAP_INSTALL_ERROR;
 ///: END:ONLY_INCLUDE_IF

app/components/Approvals/InstallSnapApproval/components/InstallSnapError/InstallSnapError.tsx

@@ -1,4 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import React, { useMemo } from 'react';
 import { View } from 'react-native';
 import styleSheet from '../../InstallSnapApproval.styles';

app/components/Approvals/InstallSnapApproval/components/InstallSnapError/index.ts

@@ -1,6 +1,4 @@
-///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 /* eslint-disable import-x/prefer-default-export */
-import InstallSnapError from './InstallSnapError';
-
-export { InstallSnapError };
+export { InstallSnapError } from './InstallSnapError';
 ///: END:ONLY_INCLUDE_IF