Update analytics and sorting

interface/layout/app.ts

@@ -8,7 +8,7 @@ import { dev, version } from "../../build.json"
 import { optionalAnalyticsPayload } from "interface/utils/analytics"
 import { checkForUpdate } from "interface/utils/update"
 import logger from "interface/utils/logger"
-import { init, trackEvent } from "@aptabase/web"
+import posthog from "posthog-js"
 
 const settings = getSettings()
 const state = getState()
@@ -20,9 +20,6 @@ const app = new App({
 
 export default app
 
-// Setup analytics
-init("A-EU-1557095726", { appVersion: version, isDebug: false })
-
 // Set background color if vibrancy not supported
 const setBackground = async () => {
 	const system = await os.type()
@@ -104,7 +101,15 @@ const optionalAnalytics = async () => {
 		const payload = await optionalAnalyticsPayload()
 
 		try {
-			trackEvent("app_start", { version: payload.version, build: payload.build, os: payload.os, lang: payload.lang, date: payload.date.toISOString().split("T")[0] })
+			posthog.init("phc_QYxqnCtHIrREhZ47S6ZVPaksY8jO2j7YZCPQjbPgF09", {
+				api_host: "https://eu.i.posthog.com",
+				capture_pageview: false,
+				capture_pageleave: false,
+				persistence: "localStorage",
+				autocapture: false,
+			})
+
+			posthog.capture("app_start", { version: payload.version, build: payload.build, os: payload.os, lang: payload.lang, date: payload.date.toISOString().split("T")[0] })
 		} catch (error) {
 			logger.error(`Failed to send analytics: ${error}`)
 		}

interface/utils/convert.ts

@@ -58,8 +58,8 @@ export const textConverter = (text: string, sortNumber: number): LibImportFile =
 					secret,
 				}).generate()
 			} catch (error) {
-				dialog.message("Failed to generate TOTP code from secret. \n\nMake sure you import file is correct!", { type: "error" })
-				logger.error("Failed to generate TOTP code from secret")
+				dialog.message("Failed to generate TOTP code from secret. \n\nMake sure your import file is correct!", { type: "error" })
+				logger.error(`Failed to generate TOTP code from secret: ${error} - ${secret}`)
 
 				state.importData = null
 				setState(state)
@@ -112,6 +112,8 @@ export const textConverter = (text: string, sortNumber: number): LibImportFile =
 		sortedMap = new Map([...codesMap.entries()].sort((a, b) => a[1].issuer.localeCompare(b[1].issuer)))
 	} else if (sortNumber === 2) {
 		sortedMap = new Map([...codesMap.entries()].sort((a, b) => b[1].issuer.localeCompare(a[1].issuer)))
+	} else {
+		sortedMap = codesMap
 	}
 
 	const sortedUniqIds = []
@@ -123,7 +125,7 @@ export const textConverter = (text: string, sortNumber: number): LibImportFile =
 		sortedUniqIds.push(key)
 		sortedNames.push(value.name)
 		sortedSecrets.push(value.secret)
-		sortedIssuers.push(value)
+		sortedIssuers.push(value.issuer)
 		sortedTypes.push(value.type)
 	})
 

package.json

@@ -58,10 +58,10 @@
 		"typescript": "^5.3.3"
 	},
 	"dependencies": {
-		"@aptabase/web": "^0.4.2",
 		"@undecaf/barcode-detector-polyfill": "^0.9.16",
 		"@undecaf/zbar-wasm": "^0.9.13",
 		"otpauth": "^8.0.3",
+		"posthog-js": "^1.145.0",
 		"qrcode-generator": "^1.4.4",
 		"ua-parser-js": "^1.0.37"
 	}