From 5c2cd4d5d5e784b43caa9e5c9cbeacefebdd11c8 Mon Sep 17 00:00:00 2001
From: Natalie Rose <natalie@omg.lol>
Date: Fri, 18 Sep 2026 14:31:05 +1000
Subject: [PATCH] Embassy fixes

---
 app/components/embassy/allianceTab.tsx | 30 ++++++++++++++------------
 app/components/embassy/stashTab.tsx    | 21 +++++++++++-------
 app/util.test.ts                       |  2 ++
 app/util.ts                            |  5 ++++-
 package-lock.json                      | 16 +++++++-------
 package.json                           |  2 +-
 6 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/app/components/embassy/allianceTab.tsx b/app/components/embassy/allianceTab.tsx
index 79584409..3f22a91d 100644
--- a/app/components/embassy/allianceTab.tsx
+++ b/app/components/embassy/allianceTab.tsx
@@ -118,29 +118,31 @@ const AllianceTab: React.FunctionComponent<Props> = ({ building, alliance, isLea
         </>
       ) : (
         <>
-          <p className='mb-3'>
+          <div className='mb-3'>
             <span className='has-text-weight-bold'>Description:</span> {alliance.description}
-          </p>
+          </div>
 
           {alliance.forum_uri && (
-            <p className='mb-3'>
+            <div className='mb-3'>
               <span className='has-text-weight-bold'>Forums:</span>{' '}
               <a href={alliance.forum_uri} target='_blank' rel='noopener noreferrer'>
                 {alliance.forum_uri}
               </a>
-            </p>
+            </div>
           )}
 
-          <div className='mb-3'>
-            <span className='has-text-weight-bold'>Announcements:</span>
-            {/*
-              The legacy client did a string replace of '\n', which only converts the first
-              newline. Splitting handles all of them.
-            */}
-            {(alliance.announcements ?? '').split('\n').map((line) => (
-              <p key={line}>{line}</p>
-            ))}
-          </div>
+          {alliance.announcements ? (
+            <div className='mb-3'>
+              <span className='has-text-weight-bold'>Announcements:</span>
+              {/*
+                The legacy client did a string replace of '\n', which only converts the first
+                newline. Splitting handles all of them.
+              */}
+              {(alliance.announcements ?? '').split('\n').map((line) => (
+                <p key={line}>{line}</p>
+              ))}
+            </div>
+          ) : undefined}
 
           <div className='field'>
             <label className='label' htmlFor='leaveReason'>
diff --git a/app/components/embassy/stashTab.tsx b/app/components/embassy/stashTab.tsx
index a12fffc2..670ec2c3 100644
--- a/app/components/embassy/stashTab.tsx
+++ b/app/components/embassy/stashTab.tsx
@@ -8,7 +8,8 @@ import {
   useExchangeWithStashMutation,
   useStashQuery,
 } from 'app/queries/embassy';
-import { BUILDING_WINDOW_SCROLL } from 'app/constants';
+import { BUILDING_WINDOW_SCROLL_SMALL } from 'app/constants';
+import _ from 'lodash';
 
 type Props = {
   building: Building;
@@ -56,7 +57,11 @@ const Stash: React.FunctionComponent<StashProps> = ({ building, stash }) => {
     value: string
   ) => {
     const wanted = Math.max(0, Math.min(util.int(value), available[type] ?? 0));
-    setBasket({ ...basket, [type]: wanted });
+    if (wanted === 0) {
+      setBasket({ ..._.omit(basket, type) });
+    } else {
+      setBasket({ ...basket, [type]: wanted });
+    }
   };
 
   //
@@ -130,7 +135,7 @@ const Stash: React.FunctionComponent<StashProps> = ({ building, stash }) => {
         {types.length === 0 ? (
           <p>{emptyMessage}</p>
         ) : (
-          <div style={{ maxHeight: BUILDING_WINDOW_SCROLL, overflowY: 'auto' }}>
+          <div style={{ maxHeight: BUILDING_WINDOW_SCROLL_SMALL, overflowY: 'auto' }}>
             <table className='table is-fullwidth is-narrow'>
               <thead>
                 <tr>
@@ -152,7 +157,7 @@ const Stash: React.FunctionComponent<StashProps> = ({ building, stash }) => {
                         max={available[type]}
                         style={{ width: 100 }}
                         aria-label={`${title} ${util.humanize(type)}`}
-                        value={basket[type] ?? 0}
+                        value={basket[type] ?? ''}
                         onChange={(event) =>
                           setAmount(basket, setBasket, available, type, event.target.value)
                         }
@@ -170,11 +175,11 @@ const Stash: React.FunctionComponent<StashProps> = ({ building, stash }) => {
 
   return (
     <>
-      <p className='mb-3'>
+      <div className='mb-3'>
         You can exchange up to {util.commify(stash.max_exchange_size)} resources at a time, and you
         have {stash.exchanges_remaining_today} exchanges left today. Donating on its own has no
         limit.
-      </p>
+      </div>
 
       <div className='columns'>
         {column(
@@ -193,9 +198,9 @@ const Stash: React.FunctionComponent<StashProps> = ({ building, stash }) => {
         )}
       </div>
 
-      <p className='mb-3'>
+      <div className='mb-3'>
         Donating {util.commify(donationTotal)}, requesting {util.commify(requestTotal)}.
-      </p>
+      </div>
 
       <button type='button' className='button is-primary' disabled={busy} onClick={handleSubmit}>
         Transfer
diff --git a/app/util.test.ts b/app/util.test.ts
index 89bdca77..4609d337 100644
--- a/app/util.test.ts
+++ b/app/util.test.ts
@@ -32,6 +32,8 @@ test('util.int', () => {
   expect(util.int('1.0sdfsl')).toBe(1);
   expect(util.int(1.111111)).toBe(1);
   expect(util.int(undefined)).toBe(0);
+  expect(util.int(NaN)).toBe(0);
+  expect(util.int('')).toBe(0);
 });
 
 test('util.formatTime', () => {
diff --git a/app/util.ts b/app/util.ts
index 6492ed0e..51105957 100644
--- a/app/util.ts
+++ b/app/util.ts
@@ -54,7 +54,10 @@ export const reduceNumber = function (number: number) {
 };
 
 export const int = function (value: string | number | undefined) {
-  if (value === undefined) return 0;
+  if (value === '' || value === undefined || (typeof value === 'number' && isNaN(value))) {
+    return 0;
+  }
+
   return typeof value === 'string' ? parseInt(value, 10) : Math.trunc(value + 0);
 };
 
diff --git a/package-lock.json b/package-lock.json
index c358ad3a..866fb293 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@fortawesome/fontawesome-free": "^6.7.2",
         "@sentry/react": "^10.74.0",
         "@tanstack/react-query": "^5.102.8",
-        "@tlecommunity/client": "^1.9.0",
+        "@tlecommunity/client": "^1.9.2",
         "bulma": "^1.0.4",
         "classnames": "^2.5.1",
         "formik": "^2.4.9",
@@ -3435,14 +3435,14 @@
       }
     },
     "node_modules/@tlecommunity/client": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@tlecommunity/client/-/client-1.9.0.tgz",
-      "integrity": "sha512-vM9d1ccpGj9z60kpaP6+XP/EIk1BWuRHHNkepHPrtLD2uTJ0RbiQnDV7rnXzVUXkK6cHtad7Ho75CrCsQQET/w==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@tlecommunity/client/-/client-1.9.2.tgz",
+      "integrity": "sha512-UvwxmgkmBIsh5F03c9LLugTYczgMQk3ubuzkN+IENwq/feHy9ghi/F7dXmj7KsZIB5ztNQY/PQoaKhLwJAl1cg==",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@types/lodash": "^4.17.25",
         "lodash": "^4.18.1",
-        "moment": "^2.30.1",
+        "moment": "^2.31.0",
         "openapi-fetch": "^0.17.0"
       },
       "engines": {
@@ -8066,9 +8066,9 @@
       }
     },
     "node_modules/moment": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.31.0.tgz",
+      "integrity": "sha512-0acOTfMiWOheYS4eoWb80yYMb/JLvVv9SHbs2PehaDzfUG0Bw855SKyk0IKTnPGa5+U2bmi3W68l1+sGLX/pvw==",
       "license": "MIT",
       "engines": {
         "node": "*"
diff --git a/package.json b/package.json
index 5ede34d8..dffda12e 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@sentry/react": "^10.74.0",
     "@tanstack/react-query": "^5.102.8",
-    "@tlecommunity/client": "^1.9.0",
+    "@tlecommunity/client": "^1.9.2",
     "bulma": "^1.0.4",
     "classnames": "^2.5.1",
     "formik": "^2.4.9",
-- 
2.51.2