working on merge conflicts

1 files changed, 5 insertions, 4 deletions

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 112bfd178..e1144f21a 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -2266,7 +2266,6 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
                     <div className="collectionfreeformview-aiView-options">
                         <input className="collectionfreeformview-aiView-prompt" placeholder="Prompt (Optional)" type="text" value={this._drawingFillInput} onChange={action(e => this._canInteract && (this._drawingFillInput = e.target.value))} />
                         <div className="collectionfreeformview-aiView-strength">
-                            Reference Strength
                             <Slider
                                 className="collectionfreeformview-aiView-slider"
                                 sx={{
@@ -2282,6 +2281,7 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
                                 onChange={action((e, val) => this._canInteract && (this._fireflyRefStrength = val as number))}
                                 valueLabelDisplay="auto"
                             />
+                            Reference Strength
                         </div>
                         <Button
                             text="Send"
@@ -2295,9 +2295,10 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
                                         this.props.Document,
                                         this._fireflyRefStrength,
                                         this._drawingFillInput !== '' ? this._drawingFillInput : StrCast(this.props.Document.title) !== 'grouping' ? StrCast(this.props.Document.title) : ''
-                                    );
-                                    this._drawingFillInput = '';
-                                    this._drawingFillLoading = false;
+                                    ).then(() => {
+                                        this._drawingFillInput = '';
+                                        this._drawingFillLoading = false;
+                                    });
                                 }),
                                 'create image'
                             )}