Login flow update and UI updated (gitbutlerapp#4716)

* UI: Fix disabled `WelcomeAction` state * update stories structure * update UI components structure * fix path to icons.json * fix path to `timeAgo` functions * added `LinkButton` component and updated login functions * copy change * remove `console.log` * lint: formatting fixes * remove `console.log` from the `Modal` story * casing change * remove duplicated folders (casing issue)
liyingqin · Aug 19, 2024 · daa285f · daa285f
1 parent 776a66b
commit daa285f
Show file tree

Hide file tree

Showing 136 changed files with 311 additions and 197 deletions.
diff --git a/apps/desktop/src/lib/branch/ActiveBranchStatus.svelte b/apps/desktop/src/lib/branch/ActiveBranchStatus.svelte
@@ -4,7 +4,7 @@
 	import { getContextStore } from '$lib/utils/context';
 	import { openExternalUrl } from '$lib/utils/url';
 	import { VirtualBranch } from '$lib/vbranches/types';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 
 	const {
 		isUnapplied = false,

diff --git a/apps/desktop/src/lib/branch/BranchDropzone.svelte b/apps/desktop/src/lib/branch/BranchDropzone.svelte
@@ -10,7 +10,7 @@
 	import { getContext } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { filesToOwnership } from '$lib/vbranches/ownership';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 
 	const branchController = getContext(BranchController);
 

diff --git a/apps/desktop/src/lib/branch/BranchHeader.svelte b/apps/desktop/src/lib/branch/BranchHeader.svelte
@@ -16,8 +16,8 @@
 	import { error } from '$lib/utils/toasts';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { VirtualBranch } from '$lib/vbranches/types';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 	import type { PullRequest } from '$lib/gitHost/interface/types';
 	import type { Persisted } from '$lib/persisted/persisted';
 

diff --git a/apps/desktop/src/lib/branch/BranchLaneContextMenu.svelte b/apps/desktop/src/lib/branch/BranchLaneContextMenu.svelte
@@ -12,8 +12,8 @@
 	import { getContext, getContextStore } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { VirtualBranch } from '$lib/vbranches/types';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
 
 	interface Props {
 		contextMenuEl?: ContextMenu;

diff --git a/apps/desktop/src/lib/branch/BranchPreviewHeader.svelte b/apps/desktop/src/lib/branch/BranchPreviewHeader.svelte
@@ -6,9 +6,9 @@
 	import { error } from '$lib/utils/toasts';
 	import { openExternalUrl } from '$lib/utils/url';
 	import { BranchController } from '$lib/vbranches/branchController';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
 	import { tooltip } from '@gitbutler/ui/utils/tooltip';
 	import type { PullRequest } from '$lib/gitHost/interface/types';
 	import type { Branch } from '$lib/vbranches/types';

diff --git a/apps/desktop/src/lib/branch/PassphraseBox.svelte b/apps/desktop/src/lib/branch/PassphraseBox.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import TextBox from '../shared/TextBox.svelte';
 	import { showError } from '$lib/notifications/toasts';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import type { SystemPromptHandle } from '$lib/backend/prompt';
 
 	export let prompt: SystemPromptHandle | undefined;

diff --git a/apps/desktop/src/lib/commit/CommitCard.svelte b/apps/desktop/src/lib/commit/CommitCard.svelte
@@ -20,10 +20,10 @@
 		VirtualBranch,
 		type CommitStatus
 	} from '$lib/vbranches/types';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
-	import { getTimeAgo } from '@gitbutler/ui/timeAgo/timeAgo';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
+	import { getTimeAgo } from '@gitbutler/ui/utils/timeAgo';
 	import { tooltip } from '@gitbutler/ui/utils/tooltip';
 	import { type Snippet } from 'svelte';
 

diff --git a/apps/desktop/src/lib/commit/CommitDialog.svelte b/apps/desktop/src/lib/commit/CommitDialog.svelte
@@ -7,7 +7,7 @@
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { Ownership } from '$lib/vbranches/ownership';
 	import { VirtualBranch } from '$lib/vbranches/types';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import type { Writable } from 'svelte/store';
 
 	export let projectId: string;

diff --git a/apps/desktop/src/lib/commit/CommitList.svelte b/apps/desktop/src/lib/commit/CommitList.svelte
@@ -25,9 +25,9 @@
 		getRemoteCommits
 	} from '$lib/vbranches/contexts';
 	import { VirtualBranch } from '$lib/vbranches/types';
-	import LineGroup from '@gitbutler/ui/CommitLines/LineGroup.svelte';
-	import { LineManagerFactory } from '@gitbutler/ui/CommitLines/lineManager';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import LineGroup from '@gitbutler/ui/commitLines/LineGroup.svelte';
+	import { LineManagerFactory } from '@gitbutler/ui/commitLines/lineManager';
 	import { goto } from '$app/navigation';
 
 	export let isUnapplied: boolean;

diff --git a/apps/desktop/src/lib/commit/CommitMessageInput.svelte b/apps/desktop/src/lib/commit/CommitMessageInput.svelte
@@ -19,8 +19,8 @@
 	import { resizeObserver } from '$lib/utils/resizeObserver';
 	import { Ownership } from '$lib/vbranches/ownership';
 	import { VirtualBranch, LocalFile } from '$lib/vbranches/types';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
-	import Checkbox from '@gitbutler/ui/inputs/Checkbox.svelte';
+	import Checkbox from '@gitbutler/ui/Checkbox.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 	import { tooltip } from '@gitbutler/ui/utils/tooltip';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { fly } from 'svelte/transition';

diff --git a/apps/desktop/src/lib/commitLines/transformers.ts b/apps/desktop/src/lib/commitLines/transformers.ts
@@ -1,5 +1,5 @@
 import type { AnyCommit } from '$lib/vbranches/types';
-import type { CommitData, Author } from '@gitbutler/ui/CommitLines/types';
+import type { CommitData, Author } from '@gitbutler/ui/commitLines/types';
 
 export function transformAnyCommit(anyCommit: AnyCommit): CommitData {
 	const output = pullCommitDetails(anyCommit);

diff --git a/apps/desktop/src/lib/components/AIPromptEdit/AIPromptEdit.svelte b/apps/desktop/src/lib/components/AIPromptEdit/AIPromptEdit.svelte
@@ -2,7 +2,7 @@
 	import { PromptService } from '$lib/ai/promptService';
 	import Content from '$lib/components/AIPromptEdit/Content.svelte';
 	import { getContext } from '$lib/utils/context';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import { get } from 'svelte/store';
 	import type { Prompts, UserPrompt } from '$lib/ai/types';
 

diff --git a/apps/desktop/src/lib/components/AIPromptEdit/Content.svelte b/apps/desktop/src/lib/components/AIPromptEdit/Content.svelte
@@ -2,8 +2,8 @@
 	import { MessageRole, type UserPrompt } from '$lib/ai/types';
 	import DialogBubble from '$lib/components/AIPromptEdit/DialogBubble.svelte';
 	import TextBox from '$lib/shared/TextBox.svelte';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 	import { createEventDispatcher } from 'svelte';
 
 	export let displayMode: 'readOnly' | 'writable' = 'writable';

diff --git a/apps/desktop/src/lib/components/AIPromptEdit/DialogBubble.svelte b/apps/desktop/src/lib/components/AIPromptEdit/DialogBubble.svelte
@@ -2,8 +2,8 @@
 	import { MessageRole } from '$lib/ai/types';
 	import { autoHeight } from '$lib/utils/autoHeight';
 	import { getMarkdownRenderer } from '$lib/utils/markdown';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 	import { marked } from 'marked';
 	import { createEventDispatcher } from 'svelte';
 

diff --git a/apps/desktop/src/lib/components/AppUpdater.svelte b/apps/desktop/src/lib/components/AppUpdater.svelte
@@ -4,8 +4,8 @@
 	import upToDateSvg from '$lib/assets/empty-state/app-up-to-date.svg?raw';
 	import { UpdaterService, type Update } from '$lib/backend/updater';
 	import { getContext } from '$lib/utils/context';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
 
 	const updaterService = getContext(UpdaterService);
 	const currentVersion = updaterService.currentVersion;

diff --git a/apps/desktop/src/lib/components/BackButton.svelte b/apps/desktop/src/lib/components/BackButton.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import { goto } from '$app/navigation';
 </script>
 

diff --git a/apps/desktop/src/lib/components/BaseBranch.svelte b/apps/desktop/src/lib/components/BaseBranch.svelte
@@ -6,9 +6,9 @@
 	import { showInfo } from '$lib/notifications/toasts';
 	import { getContext } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Checkbox from '@gitbutler/ui/inputs/Checkbox.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Checkbox from '@gitbutler/ui/Checkbox.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
 	import { tooltip } from '@gitbutler/ui/utils/tooltip';
 	import type { BaseBranch } from '$lib/baseBranch/baseBranch';
 

diff --git a/apps/desktop/src/lib/components/BaseBranchSwitch.svelte b/apps/desktop/src/lib/components/BaseBranchSwitch.svelte
@@ -10,7 +10,7 @@
 	import { getContext, getContextStore } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { VirtualBranchService } from '$lib/vbranches/virtualBranch';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 
 	const baseBranch = getContextStore(BaseBranch);
 	const vbranchService = getContext(VirtualBranchService);

diff --git a/apps/desktop/src/lib/components/Board.svelte b/apps/desktop/src/lib/components/Board.svelte
@@ -12,7 +12,7 @@
 	import { getContext, getContextStore } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { VirtualBranchService } from '$lib/vbranches/virtualBranch';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 	import { open } from '@tauri-apps/api/shell';
 
 	const vbranchService = getContext(VirtualBranchService);

diff --git a/apps/desktop/src/lib/components/BranchPreview.svelte b/apps/desktop/src/lib/components/BranchPreview.svelte
@@ -13,8 +13,8 @@
 	import { getMarkdownRenderer } from '$lib/utils/markdown';
 	import { FileIdSelection } from '$lib/vbranches/fileIdSelection';
 	import { BranchData, type Branch } from '$lib/vbranches/types';
-	import LineGroup from '@gitbutler/ui/CommitLines/LineGroup.svelte';
-	import { LineManagerFactory } from '@gitbutler/ui/CommitLines/lineManager';
+	import LineGroup from '@gitbutler/ui/commitLines/LineGroup.svelte';
+	import { LineManagerFactory } from '@gitbutler/ui/commitLines/lineManager';
 	import lscache from 'lscache';
 	import { marked } from 'marked';
 	import { onMount, setContext } from 'svelte';

diff --git a/apps/desktop/src/lib/components/DecorativeSplitView.svelte b/apps/desktop/src/lib/components/DecorativeSplitView.svelte
@@ -3,7 +3,7 @@
 	import gbLogoSvg from '$lib/assets/gb-logo.svg?raw';
 	import { User } from '$lib/stores/user';
 	import { getContextStore } from '$lib/utils/context';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 
 	export let showLinks: boolean = true;
 	export let img: string | undefined = undefined;

diff --git a/apps/desktop/src/lib/components/FilterBranchesButton.svelte b/apps/desktop/src/lib/components/FilterBranchesButton.svelte
@@ -3,8 +3,8 @@
 	import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
 	import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
 	import Toggle from '$lib/shared/Toggle.svelte';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Checkbox from '@gitbutler/ui/inputs/Checkbox.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Checkbox from '@gitbutler/ui/Checkbox.svelte';
 	import type { Writable, Readable } from 'svelte/store';
 
 	export let filtersActive: Readable<boolean>;

diff --git a/apps/desktop/src/lib/components/FullviewLoading.svelte b/apps/desktop/src/lib/components/FullviewLoading.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 </script>
 
 <div class="loading" data-tauri-drag-region><Icon name="spinner" /></div>

diff --git a/apps/desktop/src/lib/components/InsertEmptyCommitAction.svelte b/apps/desktop/src/lib/components/InsertEmptyCommitAction.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import { createEventDispatcher } from 'svelte';
 
 	export let isLast = false;

diff --git a/apps/desktop/src/lib/components/Login.svelte b/apps/desktop/src/lib/components/Login.svelte
@@ -2,7 +2,7 @@
 	import Link from '../shared/Link.svelte';
 	import { UserService, type LoginToken } from '$lib/stores/user';
 	import { getContext } from '$lib/utils/context';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 
 	const userService = getContext(UserService);
 	const loading = userService.loading;

diff --git a/apps/desktop/src/lib/components/NotOnGitButlerBranch.svelte b/apps/desktop/src/lib/components/NotOnGitButlerBranch.svelte
@@ -10,7 +10,7 @@
 	import { getContext } from '$lib/utils/context';
 	import * as toasts from '$lib/utils/toasts';
 	import { BranchController } from '$lib/vbranches/branchController';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import type { BaseBranch } from '$lib/baseBranch/baseBranch';
 	import { goto } from '$app/navigation';
 

diff --git a/apps/desktop/src/lib/components/ProblemLoadingRepo.svelte b/apps/desktop/src/lib/components/ProblemLoadingRepo.svelte
@@ -7,7 +7,7 @@
 	import { showError } from '$lib/notifications/toasts';
 	import { getContext } from '$lib/utils/context';
 	import * as toasts from '$lib/utils/toasts';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 	import { goto } from '$app/navigation';
 
 	export let error: any = undefined;

diff --git a/apps/desktop/src/lib/components/ProjectSetup.svelte b/apps/desktop/src/lib/components/ProjectSetup.svelte
@@ -8,7 +8,7 @@
 	import KeysForm from '$lib/settings/KeysForm.svelte';
 	import { getContext } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import { goto } from '$app/navigation';
 
 	export let remoteBranches: { name: string }[];

diff --git a/apps/desktop/src/lib/components/ProjectSetupTarget.svelte b/apps/desktop/src/lib/components/ProjectSetupTarget.svelte
@@ -12,7 +12,7 @@
 	import Toggle from '$lib/shared/Toggle.svelte';
 	import { UserService } from '$lib/stores/user';
 	import { getContext } from '$lib/utils/context';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import { createEventDispatcher } from 'svelte';
 
 	export let projectName: string;

diff --git a/apps/desktop/src/lib/components/ProjectSwitcher.svelte b/apps/desktop/src/lib/components/ProjectSwitcher.svelte
@@ -4,7 +4,7 @@
 	import Select from '$lib/select/Select.svelte';
 	import SelectItem from '$lib/select/SelectItem.svelte';
 	import { getContext, maybeGetContext } from '$lib/utils/context';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 	import { goto } from '$app/navigation';
 
 	const projectService = getContext(ProjectService);

diff --git a/apps/desktop/src/lib/components/PromptModal.svelte b/apps/desktop/src/lib/components/PromptModal.svelte
@@ -2,8 +2,8 @@
 	import TextBox from '../shared/TextBox.svelte';
 	import { PromptService } from '$lib/backend/prompt';
 	import { getContext } from '$lib/utils/context';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
 
 	const promptService = getContext(PromptService);
 	const [prompt, error] = promptService.reactToPrompt({ timeoutMs: 30000 });

diff --git a/apps/desktop/src/lib/components/PullRequestPreview.svelte b/apps/desktop/src/lib/components/PullRequestPreview.svelte
@@ -11,8 +11,8 @@
 	import { remoteUrlIsHttp } from '$lib/utils/url';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { VirtualBranchService } from '$lib/vbranches/virtualBranch';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
 	import { marked } from 'marked';
 	import { get } from 'svelte/store';
 	import type { PullRequest } from '$lib/gitHost/interface/types';

diff --git a/apps/desktop/src/lib/components/RemoveProjectButton.svelte b/apps/desktop/src/lib/components/RemoveProjectButton.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
 
 	export let projectTitle: string = '#';
 	export let isDeleting = false;

diff --git a/apps/desktop/src/lib/components/ShareIssueModal.svelte b/apps/desktop/src/lib/components/ShareIssueModal.svelte
@@ -7,9 +7,9 @@
 	import { User } from '$lib/stores/user';
 	import { getContext, getContextStore } from '$lib/utils/context';
 	import * as toasts from '$lib/utils/toasts';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import Checkbox from '@gitbutler/ui/inputs/Checkbox.svelte';
-	import Modal from '@gitbutler/ui/modal/Modal.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Checkbox from '@gitbutler/ui/Checkbox.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
 	import { getVersion } from '@tauri-apps/api/app';
 	import { onMount } from 'svelte';
 	import { page } from '$app/stores';

diff --git a/apps/desktop/src/lib/components/SomethingWentWrong.svelte b/apps/desktop/src/lib/components/SomethingWentWrong.svelte
@@ -2,7 +2,7 @@
 	import DecorativeSplitView from './DecorativeSplitView.svelte';
 	import ProjectSwitcher from './ProjectSwitcher.svelte';
 	import loadErrorSvg from '$lib/assets/illustrations/load-error.svg?raw';
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 
 	export let error: any = undefined;
 </script>

diff --git a/apps/desktop/src/lib/components/SyncButton.svelte b/apps/desktop/src/lib/components/SyncButton.svelte
@@ -4,8 +4,8 @@
 	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
 	import { getContext } from '$lib/utils/context';
 	import { VirtualBranchService } from '$lib/vbranches/virtualBranch';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
-	import TimeAgo from '@gitbutler/ui/timeAgo/TimeAgo.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import TimeAgo from '@gitbutler/ui/TimeAgo.svelte';
 
 	const baseBranchService = getContext(BaseBranchService);
 	const vbranchService = getContext(VirtualBranchService);

diff --git a/apps/desktop/src/lib/components/UpdateBaseButton.svelte b/apps/desktop/src/lib/components/UpdateBaseButton.svelte
@@ -2,7 +2,7 @@
 	import { showInfo, showError } from '$lib/notifications/toasts';
 	import { getContext } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
-	import Button from '@gitbutler/ui/inputs/Button.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
 
 	const branchController = getContext(BranchController);
 

diff --git a/apps/desktop/src/lib/components/WelcomeAction.svelte b/apps/desktop/src/lib/components/WelcomeAction.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Icon from '@gitbutler/ui/icon/Icon.svelte';
+	import Icon from '@gitbutler/ui/Icon.svelte';
 	import type { Snippet } from 'svelte';
 
 	const {
@@ -91,8 +91,7 @@
 	.loading {
 		pointer-events: none;
 		background-color: var(--clr-bg-2);
-		border: 1px solid transparent;
-		opacity: 0.5;
+		opacity: 0.6;
 	}
 
 	.action__content {