From 5d2d8fd81baf33157e2e1353bb62e213dfb5739f Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 23 Feb 2024 22:58:38 +0000 Subject: [PATCH] feat: rename merged as applied to better reflect proposals rather than PRs --- ...> proposals-list-item--status-applied.png} | Bin .../proposals-list-item.test.js.snap | 30 +++++++++--------- __snapshots__/proposals-status--applied.png | Bin 0 -> 8157 bytes __snapshots__/proposals-status--merged.png | Bin 7882 -> 0 bytes __snapshots__/proposals-status.test.js.snap | 4 +-- .../ProposalsListItem.stories.svelte | 2 +- .../proposals/Status.stories.svelte | 2 +- src/lib/components/proposals/Status.svelte | 2 +- src/lib/components/proposals/vectors.ts | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) rename __snapshots__/{proposals-list-item--status-merged.png => proposals-list-item--status-applied.png} (100%) create mode 100644 __snapshots__/proposals-status--applied.png delete mode 100644 __snapshots__/proposals-status--merged.png diff --git a/__snapshots__/proposals-list-item--status-merged.png b/__snapshots__/proposals-list-item--status-applied.png similarity index 100% rename from __snapshots__/proposals-list-item--status-merged.png rename to __snapshots__/proposals-list-item--status-applied.png diff --git a/__snapshots__/proposals-list-item.test.js.snap b/__snapshots__/proposals-list-item.test.js.snap index de1883d..8646dae 100644 --- a/__snapshots__/proposals-list-item.test.js.snap +++ b/__snapshots__/proposals-list-item.test.js.snap @@ -191,13 +191,13 @@ exports[`Proposals/List/Item Short Details smoke-test 1`] = ` `; -exports[`Proposals/List/Item Status Closed smoke-test 1`] = ` +exports[`Proposals/List/Item Status Applied smoke-test 1`] = `
  • - + `; -exports[`Proposals/List/Item Status Draft smoke-test 1`] = ` +exports[`Proposals/List/Item Status Closed smoke-test 1`] = `
  • `; -exports[`Proposals/List/Item Status Loading smoke-test 1`] = ` +exports[`Proposals/List/Item Status Draft smoke-test 1`] = `
  • -
    -
    + + + +     @@ -339,15 +344,10 @@ exports[`Proposals/List/Item Status Loading smoke-test 1`] = `
    • `; -exports[`Proposals/List/Item Status Merged smoke-test 1`] = ` +exports[`Proposals/List/Item Status Loading smoke-test 1`] = `
  • - - - - +
    +
    diff --git a/__snapshots__/proposals-status--applied.png b/__snapshots__/proposals-status--applied.png new file mode 100644 index 0000000000000000000000000000000000000000..11e1e3612d3db6f11515fda2f126a3f40e4e830e GIT binary patch literal 8157 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 literal 0 HcmV?d00001 diff --git a/__snapshots__/proposals-status--merged.png b/__snapshots__/proposals-status--merged.png deleted file mode 100644 index 06120e33ea0cc30a888527d199a208bd5d519982..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7882 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 GU;ht)*?Fh{ diff --git a/__snapshots__/proposals-status.test.js.snap b/__snapshots__/proposals-status.test.js.snap index 349fd30..73be2d1 100644 --- a/__snapshots__/proposals-status.test.js.snap +++ b/__snapshots__/proposals-status.test.js.snap @@ -23,12 +23,12 @@ exports[`Proposals/Status Loading smoke-test 1`] = ` `; -exports[`Proposals/Status Merged smoke-test 1`] = ` +exports[`Proposals/Status Applied smoke-test 1`] = `
    - Merged + Applied
    `; diff --git a/src/lib/components/proposals/ProposalsListItem.stories.svelte b/src/lib/components/proposals/ProposalsListItem.stories.svelte index 1611f71..136e3c5 100644 --- a/src/lib/components/proposals/ProposalsListItem.stories.svelte +++ b/src/lib/components/proposals/ProposalsListItem.stories.svelte @@ -29,6 +29,6 @@ - + diff --git a/src/lib/components/proposals/Status.stories.svelte b/src/lib/components/proposals/Status.stories.svelte index 61e987d..cfd72f8 100644 --- a/src/lib/components/proposals/Status.stories.svelte +++ b/src/lib/components/proposals/Status.stories.svelte @@ -20,7 +20,7 @@ - + diff --git a/src/lib/components/proposals/Status.svelte b/src/lib/components/proposals/Status.svelte index 07458d1..fbe671d 100644 --- a/src/lib/components/proposals/Status.svelte +++ b/src/lib/components/proposals/Status.svelte @@ -42,7 +42,7 @@ class="h-5 w-5 flex-none fill-primary-content pt-1" > - Merged + Applied {:else if status === proposal_status_closed}