feat: rename merged as applied

to better reflect proposals rather than PRs

__snapshots__/proposals-list-item.test.js.snap

@@ -191,13 +191,13 @@ exports[`Proposals/List/Item Short Details smoke-test 1`] = `
 </li>
 `;
 
-exports[`Proposals/List/Item Status Closed smoke-test 1`] = `
+exports[`Proposals/List/Item Status Applied smoke-test 1`] = `
 <li class="flex p-2 pt-4 cursor-pointer hover:bg-neutral-700">
   <svg xmlns="http://www.w3.org/2000/svg"
        viewbox="0 0 16 16"
-       class="h-5 w-5 flex-none fill-neutral-content pt-1"
+       class="h-5 w-5 flex-none fill-primary pt-1"
   >
-    <path d="M3.25 1A2.25 2.25 0 0 1 4 5.372v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.251 2.251 0 0 1 3.25 1m9.5 5.5a.75.75 0 0 1 .75.75v3.378a2.251 2.251 0 1 1-1.5 0V7.25a.75.75 0 0 1 .75-.75m-2.03-5.273a.75.75 0 0 1 1.06 0l.97.97l.97-.97a.748.748 0 0 1 1.265.332a.75.75 0 0 1-.205.729l-.97.97l.97.97a.751.751 0 0 1-.018 1.042a.751.751 0 0 1-1.042.018l-.97-.97l-.97.97a.749.749 0 0 1-1.275-.326a.749.749 0 0 1 .215-.734l.97-.97l-.97-.97a.75.75 0 0 1 0-1.06ZM2.5 3.25a.75.75 0 1 0 1.5 0a.75.75 0 0 0-1.5 0M3.25 12a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5m9.5 0a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5">
+    <path d="M5.45 5.154A4.25 4.25 0 0 0 9.25 7.5h1.378a2.251 2.251 0 1 1 0 1.5H9.25A5.734 5.734 0 0 1 5 7.123v3.505a2.25 2.25 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.95-.218M4.25 13.5a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5m8.5-4.5a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5M5 3.25a.75.75 0 1 0 0 .005z">
     </path>
   </svg>
   <a href="/repo//proposal/"
@@ -242,7 +242,7 @@ exports[`Proposals/List/Item Status Closed smoke-test 1`] = `
 </li>
 `;
 
-exports[`Proposals/List/Item Status Draft smoke-test 1`] = `
+exports[`Proposals/List/Item Status Closed smoke-test 1`] = `
 <li class="flex p-2 pt-4 cursor-pointer hover:bg-neutral-700">
   <svg xmlns="http://www.w3.org/2000/svg"
        viewbox="0 0 16 16"
@@ -293,10 +293,15 @@ exports[`Proposals/List/Item Status Draft smoke-test 1`] = `
 </li>
 `;
 
-exports[`Proposals/List/Item Status Loading smoke-test 1`] = `
+exports[`Proposals/List/Item Status Draft smoke-test 1`] = `
 <li class="flex p-2 pt-4 cursor-pointer hover:bg-neutral-700">
-  <div class="skeleton h-5 w-5 flex-none pt-1">
-  </div>
+  <svg xmlns="http://www.w3.org/2000/svg"
+       viewbox="0 0 16 16"
+       class="h-5 w-5 flex-none fill-neutral-content pt-1"
+  >
+    <path d="M3.25 1A2.25 2.25 0 0 1 4 5.372v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.251 2.251 0 0 1 3.25 1m9.5 14a2.25 2.25 0 1 1 0-4.5a2.25 2.25 0 0 1 0 4.5M2.5 3.25a.75.75 0 1 0 1.5 0a.75.75 0 0 0-1.5 0M3.25 12a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5m9.5 0a.75.75 0 1 0 0 1.5a.75.75 0 0 0 0-1.5M14 7.5a1.25 1.25 0 1 1-2.5 0a1.25 1.25 0 0 1 2.5 0m0-4.25a1.25 1.25 0 1 1-2.5 0a1.25 1.25 0 0 1 2.5 0">
+    </path>
+  </svg>
   <a href="/repo//proposal/"
      class="ml-3 grow overflow-hidden text-xs text-neutral-content"
   >
@@ -339,15 +344,10 @@ exports[`Proposals/List/Item Status Loading smoke-test 1`] = `
 </li>
 `;
 
-exports[`Proposals/List/Item Status Merged smoke-test 1`] = `
+exports[`Proposals/List/Item Status Loading smoke-test 1`] = `
 <li class="flex p-2 pt-4 cursor-pointer hover:bg-neutral-700">
-  <svg xmlns="http://www.w3.org/2000/svg"
-       viewbox="0 0 16 16"
-       class="h-5 w-5 flex-none fill-primary pt-1"
-  >
-    <path d="M5.45 5.154A4.25 4.25 0 0 0 9.25 7.5h1.378a2.251 2.251 0 1 1 0 1.5H9.25A5.734 5.734 0 0 1 5 7.123v3.505a2.25 2.25 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.95-.218M4.25 13.5a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5m8.5-4.5a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5M5 3.25a.75.75 0 1 0 0 .005z">
-    </path>
-  </svg>
+  <div class="skeleton h-5 w-5 flex-none pt-1">
+  </div>
   <a href="/repo//proposal/"
      class="ml-3 grow overflow-hidden text-xs text-neutral-content"
   >

__snapshots__/proposals-status.test.js.snap

@@ -23,12 +23,12 @@ exports[`Proposals/Status Loading smoke-test 1`] = `
 </div>
 `;
 
-exports[`Proposals/Status Merged smoke-test 1`] = `
+exports[`Proposals/Status Applied smoke-test 1`] = `
 <div tabindex="0"
      role="button"
      class="btn btn-sm align-middle cursor-default"
 >
-  Merged
+  Applied
 </div>
 `;
 

src/lib/components/proposals/ProposalsListItem.stories.svelte

@@ -29,6 +29,6 @@
 
 <Story name="Status Closed" args={vectors.StatusClosed} />
 
-<Story name="Status Merged" args={vectors.StatusMerged} />
+<Story name="Status Applied" args={vectors.StatusApplied} />
 
 <Story name="loading" args={{ loading: true }} />

src/lib/components/proposals/Status.stories.svelte

@@ -20,7 +20,7 @@
 
 <Story name="Draft" args={{ status: 'Draft' }} />
 
-<Story name="Merged" args={{ status: 'Merged' }} />
+<Story name="Applied" args={{ status: 'Applied' }} />
 
 <Story name="Open Edit Mode" args={{ edit_mode: true, status: 'Open' }} />
 

src/lib/components/proposals/Status.svelte

@@ -42,7 +42,7 @@
         class="h-5 w-5 flex-none fill-primary-content pt-1"
         ><path d={proposal_icon_path.merge} /></svg
       >
-      Merged
+      Applied
     {:else if status === proposal_status_closed}
       <!-- https://icon-sets.iconify.design/octicon/git-pull-request-closed-16/ -->
       <svg

src/lib/components/proposals/vectors.ts

@@ -59,7 +59,7 @@ export const ProposalsListItemArgsVectors = {
     ...Short,
     status: proposal_status_draft,
   } as ProposalSummary,
-  StatusMerged: {
+  StatusApplied: {
     ...Short,
     status: proposal_status_applied,
   } as ProposalSummary,