Fix PR

package.json

@@ -23,7 +23,7 @@
     "dev": "concurrently -p \"[{time}] [{name}]\" -n=sveltekit,electron -c=red,blue \"electron-vite dev --watch\" \"yarn run dev:sveltekit\"",
     "build": "yarn build:sveltekit && yarn typecheck && electron-vite build",
     "setup": "cd rust-utils && yarn && yarn build && cd ..",
-    "fetch:default-apps": "curl -L --output resources/default-apps/kando.webhapp https://drive.switch.ch/index.php/s/nSXZlwCYFAl9aRD/download",
+    "fetch:default-apps": "curl -L --output resources/default-apps/kando.webhapp https://github.com/holochain-apps/kando/releases/download/v0.8.18/kando.webhapp",
     "postinstall": "electron-builder install-app-deps",
     "build:win": "yarn build && electron-builder --win --config",
     "build:mac": "yarn build && electron-builder --mac --config",

src/main/binaries.ts

@@ -5,12 +5,12 @@ import * as path from 'path';
 
 import { HolochainLairVersionSchema } from '../types';
 
-const getFilePath = (relativePath) => path.join(app.getAppPath(), relativePath);
+const getFilePath = (relativePath: string) => path.join(app.getAppPath(), relativePath);
 
 const getPackageJSONPath = () =>
   getFilePath(app.isPackaged ? '../app.asar.unpacked/package.json' : './package.json');
 
-const readJSONFile = (filePath) => JSON.parse(readFileSync(filePath, 'utf8'));
+const readJSONFile = (filePath: string) => JSON.parse(readFileSync(filePath, 'utf8'));
 
 const packageJSON = readJSONFile(getPackageJSONPath());
 

src/renderer/src/lib/locale/en/common.json

@@ -38,5 +38,5 @@
 	"setupProgress": "Setup Progress",
 	"startingHolochain": "Starting Holochain...",
 	"startingLairKeystore": "Starting Lair Keystore...",
-	"whatDoYouWantToLaunch": "What do you want to launch?"
+	"whatDoYouWantToInstall": "What do you want to install?"
 }

src/renderer/src/routes/+page.svelte

@@ -18,7 +18,7 @@
 			return showModalError({
 				modalStore,
 				errorTitle: $i18n.t('appError'),
-				errorMessage: setupData.error.message
+				errorMessage: $i18n.t(setupData.error.message)
 			});
 		}
 

src/renderer/src/routes/main/app-store/+page.svelte

@@ -25,6 +25,8 @@
 
 	let searchInput = '';
 
+	$: isKandoInSearch = 'kando'.includes(searchInput.toLowerCase());
+
 	function handlePress(event: CustomEvent) {
 		if (!(event.detail instanceof KeyboardEvent)) return;
 
@@ -41,20 +43,22 @@
 
 <div class="grow bg-apps-list-dark-gradient">
 	<div class=" text-token grid w-full gap-4 md:grid-cols-2">
-		<div class="card variant-soft-warning m-4 flex items-center p-4">
-			<Avatar initials={'kn'} rounded="rounded-2xl" background="bg-app-gradient" />
-			<div class="ml-4 mr-2 flex-1">
-				<h3 class="h3">{$i18n.t('kando')}</h3>
-				<p class="line-clamp-2 text-xs leading-[0.8rem] opacity-60">
-					Holochain hApp for collaborative KanBan boards. Real-time collaboration delivered by syn
-				</p>
+		{#if isKandoInSearch}
+			<div class="card variant-soft-warning m-4 flex items-center p-4">
+				<Avatar initials={'kn'} rounded="rounded-2xl" background="bg-app-gradient" />
+				<div class="ml-4 mr-2 flex-1">
+					<h3 class="h3">{$i18n.t('kando')}</h3>
+					<p class="line-clamp-2 text-xs leading-[0.8rem] opacity-60">
+						Holochain hApp for collaborative KanBan boards. Real-time collaboration delivered by syn
+					</p>
+				</div>
+				<Button
+					props={{
+						onClick: () => modalStore.trigger(modal),
+						class: 'btn-app-store variant-filled'
+					}}>{$i18n.t('install')}</Button
+				>
 			</div>
-			<Button
-				props={{
-					onClick: () => modalStore.trigger(modal),
-					class: 'btn-app-store variant-filled'
-				}}>{$i18n.t('install')}</Button
-			>
-		</div>
+		{/if}
 	</div>
 </div>

src/renderer/src/routes/main/app-store/components/InputModal.svelte

@@ -3,7 +3,6 @@
 
 	export let label = '';
 	export let id: string;
-	export let pl = 'pl-16';
 	export let value: string;
 </script>
 
@@ -12,7 +11,7 @@
 	<Input
 		bind:value
 		props={{
-			class: `${pl} input-modal pt-6`,
+			class: `pl-20 input-modal pt-6`,
 			id,
 			type: 'text'
 		}}

src/renderer/src/routes/main/app-store/components/Modal.svelte

@@ -44,12 +44,7 @@
 			class="modal-form flex flex-col space-y-4 p-4"
 		>
 			<InputModal bind:value={formData.appId} id="appName" label={$i18n.t('name')} />
-			<InputModal
-				bind:value={formData.networkSeed}
-				id="networkSeed"
-				label={$i18n.t('network')}
-				pl="pl-20"
-			/>
+			<InputModal bind:value={formData.networkSeed} id="networkSeed" label={$i18n.t('network')} />
 			<footer class="modal-footer flex justify-between gap-2">
 				{#if !$installKandoMutation.isPending}
 					<Button
@@ -66,7 +61,7 @@
 				{/if}
 				<Button
 					props={{
-						disabled: formData.appId.length === 0,
+						disabled: formData.appId.length === 0 || $installKandoMutation.isPending,
 						type: 'submit',
 						class: 'btn-app-store-modal flex-1'
 					}}

src/renderer/src/routes/main/components/MainHeader.svelte

@@ -58,7 +58,7 @@
 				class: 'pl-10 input rounded text-base font-medium',
 				type: 'text',
 				placeholder:
-					type === AppStore ? $i18n.t('whatDoYouWantToLaunch') : $i18n.t('searchForApps'),
+					type === AppStore ? $i18n.t('whatDoYouWantToInstall') : $i18n.t('searchForApps'),
 				autofocus: true
 			}}
 		/>

src/renderer/src/routes/settings/components/InstallAppForm.svelte

@@ -11,6 +11,8 @@
 
 	const installedApps = client.getInstalledApps.createQuery();
 	const installHappMutation = client.installHapp.createMutation();
+
+	$: isButtonDisabled = appId.length === 0 || files.length === 0 || $installHappMutation.isPending;
 </script>
 
 <form
@@ -59,7 +61,7 @@
 	/>
 	<Button
 		props={{
-			disabled: appId.length === 0 || files.length > 0,
+			disabled: isButtonDisabled,
 			type: 'submit'
 		}}
 	>

tsconfig.json

@@ -1,4 +1,4 @@
 {
   "files": [],
-  "references": [{ "path": "./tsconfig.node.json" }],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }