Resolve conflicts

specify · Jan 19, 2025 · 33caf9b · 33caf9b
2 parents 702e118 + 416dfb2
commit 33caf9b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/FormCommands/ShowTransactions.tsx b/specifyweb/frontend/js_src/lib/components/FormCommands/ShowTransactions.tsx
@@ -144,11 +144,6 @@ export function ShowLoansCommand({
       onClose={handleClose}
     >
     {!hasAnyInteractions ? (
-        <>
-        {interactionsText.noInteractions({
-                  preparationTable: String(tables.Preparation.label).toLowerCase(),
-                })}
-        </>
       ) : (
         <>
           {Array.isArray(data.openLoans) && data.openLoans.length > 0 && (
@@ -242,6 +237,12 @@ export function ShowLoansCommand({
             </>
           )}
         </>
+      ) : (
+        <>
+        {interactionsText.noInteractions({
+                  preparationTable: String(tables.Preparation.label).toLowerCase(),
+                })}
+        </>
       )}
     </Dialog>
   ) : null;

diff --git a/specifyweb/frontend/js_src/lib/localization/interactions.ts b/specifyweb/frontend/js_src/lib/localization/interactions.ts
@@ -19,7 +19,8 @@ export const interactionsText = createDictionary({
   },
   noInteractions: {
     comment: 'Example: There are no interactions linked to this {preparation}',
-    'en-us': 'There are no interactions linked to this {preparationTable:string}.',
+    'en-us':
+      'There are no interactions linked to this {preparationTable:string}.',
   },
   addItems: {
     'en-us': 'Add Items',