From 324325915b611851b3dd25f5e8db04efb5de0345 Mon Sep 17 00:00:00 2001
From: ayangster <annie.s.yang16@gmail.com>
Date: Wed, 27 Sep 2023 10:41:03 -0700
Subject: [PATCH] Merge cleanup

---
 src/calculator-form.ts         | 10 ++++++++--
 src/icons.ts                   |  2 +-
 src/state-calculator.ts        | 16 ++++++++--------
 src/state-incentive-details.ts |  3 ++-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/calculator-form.ts b/src/calculator-form.ts
index 45aa0a0..68dbe38 100644
--- a/src/calculator-form.ts
+++ b/src/calculator-form.ts
@@ -75,7 +75,13 @@ const HOUSEHOLD_SIZE_OPTIONS: OptionParam[] = [1, 2, 3, 4, 5, 6, 7, 8].map(
 );
 
 export const formTemplate = (
-  [zip, ownerStatus, householdIncome, taxFiling, householdSize]: Array<string>,
+  [
+    zip, 
+    ownerStatus, 
+    householdIncome, 
+    taxFiling, 
+    householdSize,
+  ]: Array<string>,
   projects: Array<string>,
   showProjectField: boolean,
   onSubmit: (e: SubmitEvent) => void,
@@ -206,7 +212,7 @@ export const formTemplate = (
           </label>
         </div>
         <div>
-          <button class="calculate" type="submit">
+          <button class="primary" type="submit">
             Calculate! ${downIcon(18, 18)}
           </button>
         </div>
diff --git a/src/icons.ts b/src/icons.ts
index d71b449..6160a0d 100644
--- a/src/icons.ts
+++ b/src/icons.ts
@@ -1,4 +1,4 @@
-import { html, svg } from 'lit';
+import { html } from 'lit';
 
 // FIXME: does this need to be nested like this?
 export const downIcon = (w: number, h: number) => html`<svg
diff --git a/src/state-calculator.ts b/src/state-calculator.ts
index b3adcf8..8c9d285 100644
--- a/src/state-calculator.ts
+++ b/src/state-calculator.ts
@@ -248,14 +248,14 @@ export class RewiringAmericaStateCalculator extends LitElement {
             this._utilitiesTask.status !== TaskStatus.COMPLETE
               ? nothing
               : stateIncentivesTemplate(
-                results,
-                this.projects,
-                newOtherSelection =>
-                  (this.selectedOtherTab = newOtherSelection),
-                newSelection => (this.selectedProjectTab = newSelection),
-                this.selectedOtherTab,
-                this.selectedProjectTab,
-              ),
+                  results,
+                  this.projects,
+                  newOtherSelection =>
+                    (this.selectedOtherTab = newOtherSelection),
+                  newSelection => (this.selectedProjectTab = newSelection),
+                  this.selectedOtherTab,
+                  this.selectedProjectTab,
+                ),
           error: errorTemplate,
         })}
         ${CALCULATOR_FOOTER}
diff --git a/src/state-incentive-details.ts b/src/state-incentive-details.ts
index f95cea7..abe5957 100644
--- a/src/state-incentive-details.ts
+++ b/src/state-incentive-details.ts
@@ -440,5 +440,6 @@ export const stateIncentivesTemplate = (
     // If a nonexistent tab is selected, pretend the first one is selected.
     otherTabs.includes(selectedOtherTab) ? selectedOtherTab : otherTabs[0],
     onOtherTabSelected,
-  )}`;
+  )}
+  ${authorityLogosTemplate(response)}`;
 };