epam · rrodionov91 · Jan 3, 2024 · Jan 3, 2024 · Jan 3, 2024 · Jan 3, 2024
diff --git a/...ro-mod-7ee64-e-expanded-and-abreviation-can-not-be-removed-1-chromium-linux.png b/...ro-mod-7ee64-e-expanded-and-abreviation-can-not-be-removed-1-chromium-linux.png
diff --git a/...ecule--716dd-romode-are-represented-as-S-Groups-with-bonds-1-chromium-linux.png b/...ecule--716dd-romode-are-represented-as-S-Groups-with-bonds-1-chromium-linux.png
diff --git a/...ew-window-of-macro-structure-does-not-change-in-micro-mode-1-chromium-linux.png b/...ew-window-of-macro-structure-does-not-change-in-micro-mode-1-chromium-linux.png
diff --git a/...ew-window-of-macro-structure-does-not-change-in-micro-mode-2-chromium-linux.png b/...ew-window-of-macro-structure-does-not-change-in-micro-mode-2-chromium-linux.png
diff --git a/...ew-window-of-macro-structure-does-not-change-in-micro-mode-3-chromium-linux.png b/...ew-window-of-macro-structure-does-not-change-in-micro-mode-3-chromium-linux.png
diff --git a/...ew-window-of-macro-structure-does-not-change-in-micro-mode-4-chromium-linux.png b/...ew-window-of-macro-structure-does-not-change-in-micro-mode-4-chromium-linux.png
diff --git a/...ew-window-of-macro-structure-does-not-change-in-micro-mode-5-chromium-linux.png b/...ew-window-of-macro-structure-does-not-change-in-micro-mode-5-chromium-linux.png
diff --git a/...R-Group--8b476-nd-check-that-ABS-AND-and-OR-isn-not-appear-1-chromium-linux.png b/...R-Group--8b476-nd-check-that-ABS-AND-and-OR-isn-not-appear-1-chromium-linux.png
diff --git a/...apshots/Bond-Tool-Functional-Group-with-attach-bond-double-1-chromium-linux.png b/...apshots/Bond-Tool-Functional-Group-with-attach-bond-double-1-chromium-linux.png
diff --git a/...apshots/Bond-Tool-Functional-Group-with-attach-bond-single-1-chromium-linux.png b/...apshots/Bond-Tool-Functional-Group-with-attach-bond-single-1-chromium-linux.png
diff --git a/...apshots/Bond-Tool-Functional-Group-with-attach-bond-triple-1-chromium-linux.png b/...apshots/Bond-Tool-Functional-Group-with-attach-bond-triple-1-chromium-linux.png
diff --git a/packages/ketcher-core/src/domain/entities/monomerMicromolecule.ts b/packages/ketcher-core/src/domain/entities/monomerMicromolecule.ts
@@ -22,6 +22,7 @@ export class MonomerMicromolecule extends SGroup {
     super(type);
     this.data.absolute = false;
     this.data.attached = false;
+    this.convertedFromMacro = true;
   }
 
   public override getContractedPosition(struct: Struct) {

diff --git a/packages/ketcher-core/src/domain/entities/sgroup.ts b/packages/ketcher-core/src/domain/entities/sgroup.ts
@@ -84,6 +84,7 @@ export class SGroup {
   pp: Vec2 | null;
   data: any;
   dataArea: any;
+  convertedFromMacro: boolean;
   private readonly attachmentPoints: SGroupAttachmentPoint[];
 
   constructor(type: string) {
@@ -106,6 +107,7 @@ export class SGroup {
     this.neiAtoms = [];
     this.attachmentPoints = [];
     this.pp = null;
+    this.convertedFromMacro = false;
     this.data = {
       mul: 1, // multiplication count for MUL group
       connectivity: 'ht', // head-to-head, head-to-tail or either-unknown

diff --git a/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts b/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts
@@ -43,11 +43,13 @@ function makeStruct(editor: Editor, sGroup: SGroup) {
   makeRGroupAttachmentPoints(sGroup, existingStruct, struct, atomsIdMapping);
   makeBonds(sGroup, existingStruct, struct, atomsIdMapping);
 
-  convertSGroupAttachmentPointsToRGroupAttachmentPoints(
-    struct,
-    sGroup,
-    atomsIdMapping,
-  );
+  if (!sGroup.convertedFromMacro) {
+    convertSGroupAttachmentPointsToRGroupAttachmentPoints(
+      struct,
+      sGroup,
+      atomsIdMapping,
+    );
+  }
 
   return struct;
 }