Merge cleanup

rewiringamerica · Sep 27, 2023 · 3243259 · 3243259
1 parent df661d1
commit 3243259
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)}`;
 };