Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment

src/device/DeviceActions.tsx

@@ -42,7 +42,7 @@ import SyncDevice from "device/SyncDevice";
 // import InteractionSettings from "interactions/InteractionSettings";
 import { cloneDeep } from "lodash";
 // import { Component, Device, deviceScope, Interaction } from "models";
-import { Device, deviceScope } from "models";
+import { Component, Device, deviceScope } from "models";
 // import { MatchParams } from "navigation/Routes";
 // import { isShareableLink } from "pbHelpers/Device";
 import { pond } from "protobuf-ts/pond";
@@ -96,7 +96,7 @@ const useStyles = makeStyles((_theme: Theme) => {
 interface Props {
   device: Device;
   isPaused: boolean;
-  // components: Component[];
+  components: Component[];
   // interactions: Interaction[];
   refreshCallback: () => void;
   availablePositions: DeviceAvailabilityMap;
@@ -129,7 +129,7 @@ export default function DeviceActions(props: Props) {
   const {
     device,
     isPaused,
-    // components,
+    components,
     // interactions,
     refreshCallback,
     availablePositions,
@@ -383,8 +383,8 @@ export default function DeviceActions(props: Props) {
           closeDialogCallback={() => closeDialog("isDeviceSettingsDialogOpen")}
           refreshCallback={refreshCallback}
           canEdit={canWrite}
-          // components={components}
-          components={[]}
+          components={components}
+          //components={[]}
         />
         <ComponentSettings
           mode="add"