From b2a31d65cc70f295ccaeeb302d02c8099244f737 Mon Sep 17 00:00:00 2001
From: Austin Turner <paustint@gmail.com>
Date: Fri, 10 Mar 2023 18:23:49 -0700
Subject: [PATCH] Fix deploy metadata between orgs

initialOptions was defaulted to an empty object causing the deployment to fail

resolves #198
---
 .../deploy/deploy-to-different-org/DeployMetadataToOrg.tsx    | 2 +-
 .../DeployMetadataToOrgConfigModal.tsx                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrg.tsx b/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrg.tsx
index 323f19433..a4426272a 100644
--- a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrg.tsx
+++ b/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrg.tsx
@@ -73,7 +73,7 @@ export const DeployMetadataToOrg: FunctionComponent<DeployMetadataToOrgProps> =
       {configModalOpen && selectedMetadata && (
         <DeployMetadataToOrgConfigModal
           sourceOrg={selectedOrg}
-          initialOptions={deployMetadataOptions || {}}
+          initialOptions={deployMetadataOptions}
           initialSelectedDestinationOrg={destinationOrg}
           selectedMetadata={selectedMetadata}
           onClose={handleCloseConfigModal}
diff --git a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx b/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx
index c069fb9fa..5a1b37211 100644
--- a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx
+++ b/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/react';
 import { useNonInitialEffect } from '@jetstream/shared/ui-utils';
-import { DeployOptions, ListMetadataResult, MapOf, SalesforceOrgUi } from '@jetstream/types';
+import { DeployOptions, ListMetadataResult, MapOf, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { Grid, GridCol, Icon, Modal } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useEffect, useRef, useState } from 'react';
 import { useRecoilValue } from 'recoil';
@@ -13,7 +13,7 @@ const DISABLED_OPTIONS = new Set<keyof DeployOptions>(['allowMissingFiles', 'aut
 
 export interface DeployMetadataToOrgConfigModalProps {
   sourceOrg: SalesforceOrgUi;
-  initialOptions?: DeployOptions;
+  initialOptions?: Maybe<DeployOptions>;
   initialSelectedDestinationOrg?: SalesforceOrgUi;
   selectedMetadata: MapOf<ListMetadataResult[]>;
   onSelection?: (deployOptions: DeployOptions) => void;