Merge branch 'dev' into chatbar-payment-ui-update

Satellite-im · Dec 2, 2024 · f3acad4 · f3acad4
2 parents 1817f1e + a086f60
commit f3acad4
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uplink",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "private": true,
     "scripts": {
         "tauri": "tauri",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uplink"
-version = "2.0.4"
+version = "2.0.5"
 description = "Privacy First, Modular, P2P Universal Messaging Client - With you at it's core"
 authors = ["Satellite.IM"]
 license = ""

diff --git a/src/lib/components/ui/InstallBanner.svelte b/src/lib/components/ui/InstallBanner.svelte
@@ -42,7 +42,11 @@
         return localStorage.getItem("install-banner-dismissed") === "true"
     }
 
-    let showBanner = !(isElectron() || isTauri() || isCapacitor() || isBannerClosed())
+    function isMobile(): boolean {
+        return /Android|iPhone|iPad|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)
+    }
+
+    let showBanner = !(isElectron() || isTauri() || isMobile() || isBannerClosed())
     let platform = detectPlatform()
 
     function closeBanner() {

diff --git a/src/lib/config.ts b/src/lib/config.ts
@@ -52,9 +52,9 @@ export const INTEGRATIONS = {
 }
 
 export const DOWNLOAD_LINKS = {
-    Android: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.4/Uplink_v2.0.4.apk",
+    Android: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.5/Uplink_v2.0.5.apk",
     iOS: "https://apps.apple.com/us/app/satellite-im-uplink/id6737702825",
-    Windows: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.4/Uplink_v2.0.4.msi",
-    Mac: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.4/Uplink_v2.0.4.dmg",
-    Linux: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.4/Uplink_v2.0.4.deb",
+    Windows: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.5/Uplink_v2.0.5.msi",
+    Mac: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.5/Uplink_v2.0.5.dmg",
+    Linux: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.5/Uplink_v2.0.5.deb",
 }
diff --git a/src/routes/files/+page.svelte b/src/routes/files/+page.svelte
@@ -376,8 +376,7 @@
         search_component.select_first()
     }
 
-    const onFileSelected = async (e: Event) => {
-        const target = e.target as HTMLInputElement
+    const onFileSelected = async (target: HTMLInputElement) => {
         if (target && target.files) {
             for (let i = 0; i < target.files.length; i++) {
                 const file = target.files[i]
@@ -627,12 +626,24 @@
                         hook="button-upload-file"
                         icon
                         tooltip={$_("files.upload")}
-                        on:click={async () => {
-                            filesToUpload?.click()
+                        on:click={() => {
+                            const input = document.createElement("input")
+                            input.type = "file"
+                            input.multiple = true
+                            input.style.display = "none"
+
+                            input.addEventListener("change", _ => {
+                                const files = input.files
+                                onFileSelected(input)
+                            })
+
+                            document.body.appendChild(input)
+                            input.click()
+                            document.body.removeChild(input)
                         }}>
                         <Icon icon={Shape.Plus} />
                     </Button>
-                    <input data-cy="input=upload-files" style="display:none" multiple type="file" on:change={e => onFileSelected(e)} bind:this={filesToUpload} />
+
                     <ProgressButton appearance={Appearance.Alt} icon={Shape.ArrowsUpDown} />
                 {/if}
             </svelte:fragment>

diff --git a/src/routes/settings/about/+page.svelte b/src/routes/settings/about/+page.svelte
@@ -22,7 +22,7 @@
 
 <div id="page">
     <SettingSection hook="section-about-header" name={$_("settings.about.name")} description="Uplink"></SettingSection>
-    <SettingSection hook="section-about-version" name={$_("settings.about.version")} description="2.0.4">
+    <SettingSection hook="section-about-version" name={$_("settings.about.version")} description="2.0.5">
         <Button hook="button-check-for-update" text={$_("settings.about.checkUpdate")} appearance={Appearance.Alt}>
             <Icon icon={Shape.Refresh} />
         </Button>