resolved conflicts from develop

src/types/types.ts

@@ -302,3 +302,42 @@ type AddAction = {
 };
 
 export type SoundAction = UpdateAction | AddAction;
+export type WifiSettingValues = {
+  ssid: string;
+  password: string;
+  encryption: string;
+};
+export type ModemConfigPayload = {
+  property: string;
+  value: string;
+};
+export type WifiConfigPayload = {
+  property: string;
+  value: string;
+};
+
+export type WifiConfig = {
+  id: string;
+  fields: WifiConfigPayload[];
+};
+
+export type ModemConfig = {
+  id: string;
+  fields: ModemConfigPayload[];
+};
+
+export type ZoomInOptions = {
+  camera: string;
+  multiplier: number;
+};
+
+export type zoomConfig = {
+  camera: string;
+};
+
+export type ModemSettingsType = {
+  apn: string;
+  username: string;
+  password: string;
+  authenticationType: string;
+};