padawan - fix conflicts

Author: dcordz

app/frontend/components/SwayLoading.tsx

@@ -1,10 +1,12 @@
-const SwayLoading = ({ isHidden, className }: { isHidden?: boolean; className?: string }) => (
-    <img
-        src="/images/loading.svg"
-        alt="Loading..."
-        className={className}
-        style={{ width: "100%", maxWidth: "100px", visibility: isHidden ? "hidden" : "visible" }}
-    />
+const SwayLoading = ({ isHidden = true, className }: { isHidden?: boolean; className?: string }) => (
+    <div
+        className={`container text-center ${className || ""}`}
+        style={{
+            visibility: isHidden ? "hidden" : "visible",
+        }}
+    >
+        <img src="/images/loading.svg" alt="Loading..." style={{ maxWidth: 100 }} />
+    </div>
 );
 
 export default SwayLoading;

app/frontend/components/bill/BillSummaryModal.tsx

@@ -34,7 +34,7 @@ const BillSummaryModal: React.FC<IProps> = ({
         (isTruncated: boolean) => {
             if (!summary) return null;
 
-            // TODO: Arbitrarily picked 200, should probably cut-off also at first bullet point or after first paragraph.
+            // TODO: Arbitrarily picked 300, should probably cut-off also at first bullet point or after first paragraph.
             // truncate to first index of a markdown link or 300
             const firstLinkOpenIndex = summary.indexOf("[");
             const truncated = summary