diff --git a/apps/desktop/README.md b/apps/desktop/README.md
index 4dc17fb90c..e1640efcbe 100644
--- a/apps/desktop/README.md
+++ b/apps/desktop/README.md
@@ -18,7 +18,7 @@ Execute the following command on your terminal \
cargo run -p but-server
```
-This shoud start the server on th default port 6978
+This should start the server on th default port 6978
#### 2. Run the FE dev server
diff --git a/apps/desktop/cypress/e2e/branches.cy.ts b/apps/desktop/cypress/e2e/branches.cy.ts
index 139fd7f63f..c126cab1cc 100644
--- a/apps/desktop/cypress/e2e/branches.cy.ts
+++ b/apps/desktop/cypress/e2e/branches.cy.ts
@@ -168,7 +168,7 @@ describe('Branches', () => {
cy.getByTestId('delete-local-branch-confirmation-modal').should('not.exist');
});
- it('should be able to preivew multiple branches', () => {
+ it('should be able to preview multiple branches', () => {
// Should be able to navigate the different branches
for (const branch of mockBackend.branchListings) {
cy.getByTestId('branch-list-card', branch.name).first().should('be.visible').click();
diff --git a/apps/desktop/cypress/e2e/errorHandling.cy.ts b/apps/desktop/cypress/e2e/errorHandling.cy.ts
index 1866c1aa75..8fb95a4fa6 100644
--- a/apps/desktop/cypress/e2e/errorHandling.cy.ts
+++ b/apps/desktop/cypress/e2e/errorHandling.cy.ts
@@ -146,7 +146,7 @@ describe('Error handling - commit actions', () => {
expect(mockBackend.getDiff).to.have.callCount(0);
});
- it('Fully failing to commit with rejection reasons shuold be handled graceful', () => {
+ it('Fully failing to commit with rejection reasons should be handled graceful', () => {
mockCommand('create_commit_from_worktree_changes', () =>
mockBackend.commitFailureWithReasons(null)
);
@@ -208,7 +208,7 @@ describe('Error handling - commit actions', () => {
cy.getByTestId('commit-drawer-description-input').should('contain', newCommitMessageBody);
});
- it('Partially failing to commit with rejection reasons shuold be handled graceful', () => {
+ it('Partially failing to commit with rejection reasons should be handled graceful', () => {
const newCommitId = '29384726398746289374';
mockCommand('create_commit_from_worktree_changes', () =>
mockBackend.commitFailureWithReasons(newCommitId)
diff --git a/apps/desktop/cypress/e2e/selection.cy.ts b/apps/desktop/cypress/e2e/selection.cy.ts
index fcccbc1e17..0045f509e1 100644
--- a/apps/desktop/cypress/e2e/selection.cy.ts
+++ b/apps/desktop/cypress/e2e/selection.cy.ts
@@ -32,7 +32,7 @@ describe('Selection', () => {
cy.getByTestId('branch-header').should('contain', mockBackend.stackId);
const stacks = mockBackend.getStacks();
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
// Select the second stack
@@ -45,7 +45,7 @@ describe('Selection', () => {
cy.getByTestIdByValue('branch-header', stackName)
.click()
.within(() => {
- // Shouls have the stack url
+ // Should have the stack url
cy.urlMatches(`/${PROJECT_ID}/workspace`);
});
// Check if the file list is updated
@@ -68,7 +68,7 @@ describe('Selection', () => {
const stacks = mockBackend.getStacks();
const stack = stacks[0]!;
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
// Select the initial commit which should be local only
@@ -92,7 +92,7 @@ describe('Selection', () => {
cy.getByTestId('branch-header').should('contain', mockBackend.stackWithTwoCommits);
const stacks = mockBackend.getStacks();
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
cy.getByTestIdByValue('stack', mockBackend.stackWithTwoCommits)
@@ -153,7 +153,7 @@ describe('Selection', () => {
cy.getByTestId('branch-header').should('contain', mockBackend.stackWithTwoCommits);
const stacks = mockBackend.getStacks();
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
cy.getByTestIdByValue('stack', mockBackend.stackWithTwoCommits)
@@ -239,7 +239,7 @@ describe('Selection with upstream changes', () => {
cy.getByTestId('branch-header').should('contain', mockBackend.stackId);
const stacks = mockBackend.getStacks();
- // There shuold be three stacks
+ // There should be three stacks
cy.getByTestId('stack').should('have.length', stacks.length);
// Select the initial commit which should be local only
diff --git a/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts b/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts
index e8a678b6ff..8f8d4261d3 100644
--- a/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts
+++ b/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts
@@ -348,7 +348,7 @@ describe('Unified Diff View with complex hunks', () => {
// Click on start a commit
cy.getByTestId('start-commit-button').first().click();
- // Unstage everything expet the long hunk file
+ // Unstage everything expect the long hunk file
cy.getByTestId('uncommitted-changes-file-list').within(() => {
cy.getByTestId('file-list-item').each((item) => {
const fileName = item.text().trim();
diff --git a/apps/desktop/cypress/e2e/workspace.cy.ts b/apps/desktop/cypress/e2e/workspace.cy.ts
index 557d46f175..592bfdf812 100644
--- a/apps/desktop/cypress/e2e/workspace.cy.ts
+++ b/apps/desktop/cypress/e2e/workspace.cy.ts
@@ -9,7 +9,7 @@ describe('Workspace', () => {
});
it('Should be redirected to the workspace', () => {
- // This is basically jsut a smoke test to check that the workspace is loaded
+ // This is basically just a smoke test to check that the workspace is loaded
cy.visit('/');
// Should be redirected to the workspac
diff --git a/apps/desktop/src/components/BranchHeader.svelte b/apps/desktop/src/components/BranchHeader.svelte
index 9d66e3c40e..4a73c7432e 100644
--- a/apps/desktop/src/components/BranchHeader.svelte
+++ b/apps/desktop/src/components/BranchHeader.svelte
@@ -128,7 +128,7 @@
class="branch-header"
class:selected
class:active
- class:commiting={isCommitting}
+ class:committing={isCommitting}
{onclick}
onkeypress={onclick}
tabindex="0"
diff --git a/apps/desktop/src/components/ChunkyList.svelte b/apps/desktop/src/components/ChunkyList.svelte
index f1c618bdb7..81e5805fa8 100644
--- a/apps/desktop/src/components/ChunkyList.svelte
+++ b/apps/desktop/src/components/ChunkyList.svelte
@@ -5,7 +5,7 @@
diff --git a/apps/desktop/src/components/CommitLineOverlay.svelte b/apps/desktop/src/components/CommitLineOverlay.svelte
index 6eeacb4173..8b6d524db0 100644
--- a/apps/desktop/src/components/CommitLineOverlay.svelte
+++ b/apps/desktop/src/components/CommitLineOverlay.svelte
@@ -4,10 +4,10 @@
interface Props {
hovered: boolean;
activated: boolean;
- advertize?: boolean;
+ advertise?: boolean;
}
- const { hovered, activated, advertize }: Props = $props();
+ const { hovered, activated, advertise }: Props = $props();
let containerElement = $state();
let indicatorElement = $state();
@@ -46,7 +46,7 @@
bind:this={containerElement}
class="dropzone-target container"
class:activated
- class:advertize
+ class:advertise
class:hovered
>
@@ -56,7 +56,7 @@