diff --git a/README.md b/README.md
index 4256cfbfa..2396869e5 100644
--- a/README.md
+++ b/README.md
@@ -102,10 +102,14 @@ All your pull requests must pass the CI build only then, it will be allowed to m
 Sometimes, when the build doesn't pass you can use these commands in your local terminal and check for the errors,</br>
 
 **We've commited to use Material3 design in our project. And added lint check for not to use any M2 libraries in our project.</br>**
-**And when adding new library, please make sure to follow the naming convention and place in sequential order(A->Z).**
+**And when adding new library, please make sure to follow the naming convention and place in sequential order(A->Z).</br>**
 
 In MacOS, Windows or Linux, you should run the following commands before opening a PR, and make sure to pass all the commands:
 
+**In order to enhance our development process, we have implemented Git hooks in our project. 
+To install these hooks locally, simply run the command `./gradlew installGitHooks`. 
+This will ensure that the Git hooks are installed on your local machine.**</br>
+
 * `./gradlew check -p build-logic` this checks build-logic configured properly.</br>
 * `./gradlew spotlessApply --no-configuration-cache` an check and apply formatting to any file.</br>
 * `./gradlew dependencyGuardBaseline`  to generate dependency-guard baseline.</br>
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
index f4bf1069d..6a0f9ea3b 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@@ -28,6 +28,9 @@ dependencies {
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
     compileOnly(libs.room.gradlePlugin)
+    compileOnly(libs.detekt.gradlePlugin)
+    compileOnly(libs.ktlint.gradlePlugin)
+    compileOnly(libs.spotless.gradle)
     implementation(libs.truth)
 }
 
@@ -88,5 +91,25 @@ gradlePlugin {
             id = "mifospay.android.application.flavors"
             implementationClass = "AndroidApplicationFlavorsConventionPlugin"
         }
+        register("detekt") {
+            id = "mifos.detekt.plugin"
+            implementationClass = "MifosDetektConventionPlugin"
+            description = "Configures detekt for the project"
+        }
+        register("spotless") {
+            id = "mifos.spotless.plugin"
+            implementationClass = "MifosSpotlessConventionPlugin"
+            description = "Configures spotless for the project"
+        }
+        register("ktlint") {
+            id = "mifos.ktlint.plugin"
+            implementationClass = "MifosKtlintConventionPlugin"
+            description = "Configures kotlinter for the project"
+        }
+        register("gitHooks") {
+            id = "mifos.git.hooks"
+            implementationClass = "MifosGitHooksConventionPlugin"
+            description = "Installs git hooks for the project"
+        }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index b6df4f6c3..b4f907e05 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -17,6 +17,10 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 apply("org.jetbrains.kotlin.android")
                 apply("mifospay.android.lint")
                 apply("com.dropbox.dependency-guard")
+                apply("mifos.detekt.plugin")
+                apply("mifos.spotless.plugin")
+                apply("mifos.ktlint.plugin")
+                apply("mifos.git.hooks")
             }
 
             extensions.configure<ApplicationExtension> {
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index a749b93e6..e3967793e 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -18,6 +18,9 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 apply("com.android.library")
                 apply("org.jetbrains.kotlin.android")
                 apply("mifospay.android.lint")
+                apply("mifos.detekt.plugin")
+                apply("mifos.spotless.plugin")
+                apply("mifos.ktlint.plugin")
             }
 
             extensions.configure<LibraryExtension> {
diff --git a/build-logic/convention/src/main/kotlin/MifosDetektConventionPlugin.kt b/build-logic/convention/src/main/kotlin/MifosDetektConventionPlugin.kt
new file mode 100644
index 000000000..970e0fefd
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/MifosDetektConventionPlugin.kt
@@ -0,0 +1,23 @@
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.mifospay.configureDetekt
+import org.mifospay.detektGradle
+
+class MifosDetektConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            applyPlugins()
+
+            detektGradle {
+                configureDetekt(this)
+            }
+        }
+    }
+
+    private fun Project.applyPlugins() {
+        pluginManager.apply {
+            apply("io.gitlab.arturbosch.detekt")
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/MifosGitHooksConventionPlugin.kt b/build-logic/convention/src/main/kotlin/MifosGitHooksConventionPlugin.kt
new file mode 100644
index 000000000..18208729a
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/MifosGitHooksConventionPlugin.kt
@@ -0,0 +1,54 @@
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.Exec
+import org.gradle.kotlin.dsl.register
+import java.util.Locale
+
+class MifosGitHooksConventionPlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+        // Define a function to check if the OS is Linux or MacOS
+        fun isLinuxOrMacOs(): Boolean {
+            val osName = System.getProperty("os.name").lowercase(Locale.getDefault())
+            return osName.contains("linux") || osName.contains("mac os") || osName.contains("macos")
+        }
+
+        // Define the copyGitHooks task
+        project.tasks.register<Copy>("copyGitHooks") {
+            description = "Copies the git hooks from /scripts to the .git/hooks folder."
+            from("${project.rootDir}/scripts/") {
+                include("**/*.sh")
+                rename { it.removeSuffix(".sh") }
+            }
+            into("${project.rootDir}/.git/hooks")
+        }
+
+        // Define the installGitHooks task
+        project.tasks.register<Exec>("installGitHooks") {
+            description = "Installs the pre-commit git hooks from the scripts directory."
+            group = "git hooks"
+            workingDir = project.rootDir
+
+            if (isLinuxOrMacOs()) {
+                commandLine("chmod", "-R", "+x", ".git/hooks/")
+            }else {
+                commandLine("cmd", "/c", "attrib", "-R", "+X", ".git/hooks/*.*")
+            }
+            dependsOn(project.tasks.named("copyGitHooks"))
+
+            doLast {
+                println("Git hooks installed successfully.")
+            }
+        }
+
+        // Configure task dependencies after evaluation
+        project.afterEvaluate {
+            project.tasks.matching {
+                it.name in listOf("preBuild", "build", "assembleDebug", "assembleRelease", "installDebug", "installRelease", "clean")
+            }.configureEach {
+                dependsOn(project.tasks.named("installGitHooks"))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/MifosKtlintConventionPlugin.kt b/build-logic/convention/src/main/kotlin/MifosKtlintConventionPlugin.kt
new file mode 100644
index 000000000..68afeb46e
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/MifosKtlintConventionPlugin.kt
@@ -0,0 +1,16 @@
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class MifosKtlintConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            applyPlugins()
+        }
+    }
+
+    private fun Project.applyPlugins() {
+        pluginManager.apply {
+            apply("org.jlleitschuh.gradle.ktlint")
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/MifosSpotlessConventionPlugin.kt b/build-logic/convention/src/main/kotlin/MifosSpotlessConventionPlugin.kt
new file mode 100644
index 000000000..37201ce3d
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/MifosSpotlessConventionPlugin.kt
@@ -0,0 +1,22 @@
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.mifospay.configureSpotless
+import org.mifospay.spotlessGradle
+
+class MifosSpotlessConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            applyPlugins()
+
+            spotlessGradle {
+                configureSpotless(this)
+            }
+        }
+    }
+
+    private fun Project.applyPlugins() {
+        pluginManager.apply {
+            apply("com.diffplug.spotless")
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/mifospay/Detekt.kt b/build-logic/convention/src/main/kotlin/org/mifospay/Detekt.kt
new file mode 100644
index 000000000..1059d2da3
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/mifospay/Detekt.kt
@@ -0,0 +1,23 @@
+package org.mifospay
+
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.named
+
+internal fun Project.configureDetekt(extension: DetektExtension) = extension.apply {
+    tasks.named<Detekt>("detekt") {
+        reports {
+            xml.required.set(true)
+            html.required.set(true)
+            txt.required.set(true)
+            sarif.required.set(true)
+            md.required.set(true)
+        }
+    }
+    dependencies {
+        "detektPlugins"(libs.findLibrary("detekt-formatting").get())
+        "detektPlugins"(libs.findLibrary("twitter-detekt-compose").get())
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/mifospay/ProjectExtensions.kt b/build-logic/convention/src/main/kotlin/org/mifospay/ProjectExtensions.kt
index 083999627..28fd88c0c 100644
--- a/build-logic/convention/src/main/kotlin/org/mifospay/ProjectExtensions.kt
+++ b/build-logic/convention/src/main/kotlin/org/mifospay/ProjectExtensions.kt
@@ -1,9 +1,22 @@
 package org.mifospay
 
+import com.diffplug.gradle.spotless.SpotlessExtension
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.getByType
 
 val Project.libs
     get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+inline fun Project.detektGradle(crossinline configure: DetektExtension.() -> Unit) =
+    extensions.configure<DetektExtension> {
+        configure()
+    }
+
+inline fun Project.spotlessGradle(crossinline configure: SpotlessExtension.() -> Unit) =
+    extensions.configure<SpotlessExtension> {
+        configure()
+    }
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/mifospay/Spotless.kt b/build-logic/convention/src/main/kotlin/org/mifospay/Spotless.kt
new file mode 100644
index 000000000..871aeaa34
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/mifospay/Spotless.kt
@@ -0,0 +1,31 @@
+package org.mifospay
+
+import com.diffplug.gradle.spotless.SpotlessExtension
+import org.gradle.api.Project
+
+val ktlintVersion = "1.0.1"
+
+internal fun Project.configureSpotless(extension: SpotlessExtension) = extension.apply {
+    kotlin {
+        target("**/*.kt")
+        targetExclude("**/build/**/*.kt")
+        ktlint(ktlintVersion).editorConfigOverride(
+            mapOf("android" to "true"),
+        )
+        licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
+    }
+
+    format("kts") {
+        target("**/*.kts")
+        targetExclude("**/build/**/*.kts")
+        // Look for the first line that doesn't have a block comment (assumed to be the license)
+        licenseHeaderFile(rootProject.file("spotless/copyright.kts"), "(^(?![\\/ ]\\*).*$)")
+    }
+
+    format("xml") {
+        target("**/*.xml")
+        targetExclude("**/build/**/*.xml")
+        // Look for the first XML tag that isn't a comment (<!--) or the xml declaration (<?xml)
+        licenseHeaderFile(rootProject.file("spotless/copyright.xml"), "(<[^!?])")
+    }
+}
\ No newline at end of file
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 2907fbfb8..875164f78 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -2,6 +2,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
     versionCatalogs {
         create("libs") {
diff --git a/build.gradle.kts b/build.gradle.kts
index 8431176ea..064849ef6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,6 @@ buildscript {
         classpath(libs.google.oss.licenses.plugin) {
             exclude(group = "com.google.protobuf")
         }
-        classpath(libs.spotless.gradle)
     }
 }
 
@@ -25,70 +24,14 @@ plugins {
     alias(libs.plugins.secrets) apply false
     alias(libs.plugins.room) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.detekt) apply true
-    // Plugin applied to allow module graph generation
     alias(libs.plugins.module.graph) apply true
-    alias(libs.plugins.spotless) apply true
+    alias(libs.plugins.detekt) apply false
+    alias(libs.plugins.spotless) apply false
+    alias(libs.plugins.ktlint) apply false
+    alias(libs.plugins.version.catalog.linter) apply true
     // Multiplatform plugins
     alias(libs.plugins.jetbrainsCompose) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.wire) apply false
-}
-
-val detektFormatting = libs.detekt.formatting
-val twitterComposeRules = libs.twitter.detekt.compose
-val ktlintVersion = "1.0.1"
-
-subprojects {
-    apply {
-        plugin("io.gitlab.arturbosch.detekt")
-        plugin("com.diffplug.spotless")
-    }
-
-    tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
-        config.from(rootProject.files("config/detekt/detekt.yml"))
-        reports.xml.required.set(true)
-        reports.html.required.set(true)
-    }
-
-    extensions.configure<com.diffplug.gradle.spotless.SpotlessExtension> {
-        kotlin {
-            target("**/*.kt")
-            targetExclude("**/build/**/*.kt")
-            ktlint(ktlintVersion).editorConfigOverride(
-                mapOf(
-                    "android" to "true",
-                ),
-            )
-            licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
-        }
-        format("kts") {
-            target("**/*.kts")
-            targetExclude("**/build/**/*.kts")
-            // Look for the first line that doesn't have a block comment (assumed to be the license)
-            licenseHeaderFile(rootProject.file("spotless/copyright.kts"), "(^(?![\\/ ]\\*).*$)")
-        }
-        format("xml") {
-            target("**/*.xml")
-            targetExclude("**/build/**/*.xml")
-            // Look for the first XML tag that isn't a comment (<!--) or the xml declaration (<?xml)
-            licenseHeaderFile(rootProject.file("spotless/copyright.xml"), "(<[^!?])")
-        }
-    }
-
-    dependencies {
-        detektPlugins(detektFormatting)
-        detektPlugins(twitterComposeRules)
-    }
-}
-
-// Task to print all the module paths in the project e.g. :core:data
-// Used by module graph generator script
-tasks.register("printModulePaths") {
-    subprojects {
-        if (subprojects.size == 0) {
-            println(this.path)
-        }
-    }
 }
\ No newline at end of file
diff --git a/ci-prebuild.bat b/ci-prepush.bat
similarity index 95%
rename from ci-prebuild.bat
rename to ci-prepush.bat
index dc7e9d6bc..60ffba915 100644
--- a/ci-prebuild.bat
+++ b/ci-prepush.bat
@@ -12,6 +12,7 @@ echo Starting all checks and tests...
 call :run_gradle_task "check -p build-logic"
 call :run_gradle_task "spotlessApply --no-configuration-cache"
 call :run_gradle_task "dependencyGuardBaseline"
+call :run_gradle_task "formatVersionCatalog"
 call :run_gradle_task "detekt"
 call :run_gradle_task "testDemoDebug :lint:test :mifospay:lintProdRelease :lint:lint"
 call :run_gradle_task "build"
diff --git a/ci-prebuild.sh b/ci-prepush.sh
similarity index 97%
rename from ci-prebuild.sh
rename to ci-prepush.sh
index 3e02d3d01..95cc04913 100644
--- a/ci-prebuild.sh
+++ b/ci-prepush.sh
@@ -28,6 +28,7 @@ tasks=(
     "spotlessApply --no-configuration-cache"
     "dependencyGuardBaseline"
     "detekt"
+    "formatVersionCatalog"
     "testDemoDebug :lint:test :lint:lint :mifospay:lintProdRelease"
     "build"
     "updateProdReleaseBadging"
diff --git a/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/BlockUnblockCommand.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/BlockUnblockCommand.kt
index c43caada0..1185fba19 100644
--- a/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/BlockUnblockCommand.kt
+++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/BlockUnblockCommand.kt
@@ -30,11 +30,11 @@ class BlockUnblockCommand @Inject constructor(
                     requestValues.command,
                 )
                 withContext(Dispatchers.Main) {
-                    Log.d("BlockUnblockCommand@@@@","$res")
+                    Log.d("BlockUnblockCommand@@@@", "$res")
                     useCaseCallback.onSuccess(ResponseValue)
                 }
             } catch (e: Exception) {
-                Log.d("BlockUnblockCommand@@@@","${e.message}")
+                Log.d("BlockUnblockCommand@@@@", "${e.message}")
                 useCaseCallback.onError(
                     "Error " + requestValues.command + "ing account",
                 )
diff --git a/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransaction.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransaction.kt
index 9a6f494a4..52c917278 100644
--- a/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransaction.kt
+++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransaction.kt
@@ -34,13 +34,13 @@ class FetchAccountTransaction @Inject constructor(
                     requestValues.transactionId,
                 )
                 withContext(Dispatchers.Main) {
-                    Log.d("FetchTransactions@@@@","$res")
+                    Log.d("FetchTransactions@@@@", "$res")
                     useCaseCallback.onSuccess(
                         ResponseValue(transactionMapper.transformInvoice(res)),
                     )
                 }
             } catch (e: Exception) {
-                Log.d("FetchTransactions@@@@","${e.message}")
+                Log.d("FetchTransactions@@@@", "${e.message}")
                 withContext(Dispatchers.Main) {
                     if (e.message == "HTTP 401 Unauthorized") {
                         useCaseCallback.onError(Constants.UNAUTHORIZED_ERROR)
diff --git a/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransactions.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransactions.kt
index 26d1db1c9..9504ee9ee 100644
--- a/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransactions.kt
+++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransactions.kt
@@ -31,7 +31,7 @@ class FetchAccountTransactions @Inject constructor(
             try {
                 val api = fineractRepository.getSelfAccountTransactions(requestValues.accountId)
                 withContext(Dispatchers.Main) {
-                    Log.d("FetchTransactions@@@@","$api")
+                    Log.d("FetchTransactions@@@@", "$api")
                     useCaseCallback.onSuccess(
                         ResponseValue(
                             transactionMapper.transformTransactionList(api),
@@ -40,7 +40,7 @@ class FetchAccountTransactions @Inject constructor(
                 }
             } catch (e: Exception) {
                 withContext(Dispatchers.Main) {
-                    Log.d("FetchTransactions@@@@","${e.message}")
+                    Log.d("FetchTransactions@@@@", "${e.message}")
                     useCaseCallback.onError(
                         Constants.ERROR_FETCHING_REMOTE_ACCOUNT_TRANSACTIONS,
                     )
diff --git a/core/data/src/main/java/org/mifospay/core/data/fineract/repository/FineractRepository.kt b/core/data/src/main/java/org/mifospay/core/data/fineract/repository/FineractRepository.kt
index 5f439c562..054b9a6d3 100644
--- a/core/data/src/main/java/org/mifospay/core/data/fineract/repository/FineractRepository.kt
+++ b/core/data/src/main/java/org/mifospay/core/data/fineract/repository/FineractRepository.kt
@@ -103,8 +103,8 @@ class FineractRepository @Inject constructor(
         return fineractApiManager.clientsApi.getAccounts(clientId, Constants.SAVINGS)
     }
 
-    suspend fun savingsAccounts(): Page<SavingsWithAssociations>
-        = fineractApiManager.ktorSavingsAccountApi.getSavingsAccounts(-1)
+    suspend fun savingsAccounts(): Page<SavingsWithAssociations> =
+        fineractApiManager.ktorSavingsAccountApi.getSavingsAccounts(-1)
 
     suspend fun blockUnblockAccount(accountId: Long, command: String?): GenericResponse {
         return fineractApiManager.ktorSavingsAccountApi.blockUnblockAccount(
diff --git a/core/model/src/main/java/com/mifospay/core/model/domain/client/Client.kt b/core/model/src/main/java/com/mifospay/core/model/domain/client/Client.kt
index 0ec05be34..9f8626325 100644
--- a/core/model/src/main/java/com/mifospay/core/model/domain/client/Client.kt
+++ b/core/model/src/main/java/com/mifospay/core/model/domain/client/Client.kt
@@ -9,8 +9,6 @@
  */
 package com.mifospay.core.model.domain.client
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Serializable
diff --git a/core/model/src/main/java/com/mifospay/core/model/entity/Role.kt b/core/model/src/main/java/com/mifospay/core/model/entity/Role.kt
index b3dc7a2ab..e4678e918 100644
--- a/core/model/src/main/java/com/mifospay/core/model/entity/Role.kt
+++ b/core/model/src/main/java/com/mifospay/core/model/entity/Role.kt
@@ -9,8 +9,6 @@
  */
 package com.mifospay.core.model.entity
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Serializable
diff --git a/core/model/src/main/java/com/mifospay/core/model/entity/UserWithRole.kt b/core/model/src/main/java/com/mifospay/core/model/entity/UserWithRole.kt
index 423c2e88e..e54eb80a8 100644
--- a/core/model/src/main/java/com/mifospay/core/model/entity/UserWithRole.kt
+++ b/core/model/src/main/java/com/mifospay/core/model/entity/UserWithRole.kt
@@ -9,8 +9,6 @@
  */
 package com.mifospay.core.model.entity
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Serializable
diff --git a/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransactionType.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransactionType.kt
index c51e65c9a..886a5492c 100644
--- a/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransactionType.kt
+++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransactionType.kt
@@ -9,9 +9,7 @@
  */
 package com.mifospay.core.model.entity.accounts.savings
 
-import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Serializable
diff --git a/core/model/src/main/java/com/mifospay/core/model/entity/authentication/AuthenticationPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/authentication/AuthenticationPayload.kt
index 6bf71a12c..5fbda092e 100644
--- a/core/model/src/main/java/com/mifospay/core/model/entity/authentication/AuthenticationPayload.kt
+++ b/core/model/src/main/java/com/mifospay/core/model/entity/authentication/AuthenticationPayload.kt
@@ -9,24 +9,21 @@
  */
 package com.mifospay.core.model.entity.authentication
 
-import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
-//@Parcelize
-//class AuthenticationPayload(
+// @Parcelize
+// class AuthenticationPayload(
 //    @SerializedName("username")
 //    val userName: String,
 //    @SerializedName("password")
 //    val password: String,
-//) : Parcelable
-
+// ) : Parcelable
 
 @Serializable
 data class AuthenticationPayload(
     @SerializedName("username")
     val username: String,
     @SerializedName("password")
-    val password: String
-)
\ No newline at end of file
+    val password: String,
+)
diff --git a/core/model/src/main/java/com/mifospay/core/model/entity/client/Client.kt b/core/model/src/main/java/com/mifospay/core/model/entity/client/Client.kt
index 62fef0e1a..621915b64 100644
--- a/core/model/src/main/java/com/mifospay/core/model/entity/client/Client.kt
+++ b/core/model/src/main/java/com/mifospay/core/model/entity/client/Client.kt
@@ -9,10 +9,8 @@
  */
 package com.mifospay.core.model.entity.client
 
-import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
 import com.mifospay.core.model.entity.Timeline
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Serializable
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
index 5bc897cc0..5b13992d6 100644
--- a/core/network/build.gradle.kts
+++ b/core/network/build.gradle.kts
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md
+ */
 import com.android.build.api.dsl.Packaging
 
 /*
diff --git a/core/network/src/main/kotlin/org/mifospay/core/network/KtorInterceptor.kt b/core/network/src/main/kotlin/org/mifospay/core/network/KtorInterceptor.kt
index c893a4d4c..5a5fd156f 100644
--- a/core/network/src/main/kotlin/org/mifospay/core/network/KtorInterceptor.kt
+++ b/core/network/src/main/kotlin/org/mifospay/core/network/KtorInterceptor.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md
+ */
 package org.mifospay.core.network
 
 import io.ktor.client.HttpClient
@@ -8,7 +17,7 @@ import io.ktor.util.AttributeKey
 import org.mifospay.core.datastore.PreferencesHelper
 
 class KtorInterceptor(
-    private val preferencesHelper: PreferencesHelper
+    private val preferencesHelper: PreferencesHelper,
 ) {
     class Config {
         lateinit var preferencesHelper: PreferencesHelper
diff --git a/core/network/src/main/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt b/core/network/src/main/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt
index 7dd8163c7..059594223 100644
--- a/core/network/src/main/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt
+++ b/core/network/src/main/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt
@@ -12,7 +12,6 @@ package org.mifospay.core.network
 import org.mifospay.core.network.services.AuthenticationService
 import org.mifospay.core.network.services.BeneficiaryService
 import org.mifospay.core.network.services.ClientService
-import org.mifospay.core.network.services.KtorAuthenticationService
 import org.mifospay.core.network.services.KtorSavingsAccountService
 import org.mifospay.core.network.services.RegistrationService
 import org.mifospay.core.network.services.SavingsAccountsService
@@ -26,7 +25,7 @@ class SelfServiceApiManager @Inject constructor(
     private val registrationService: RegistrationService,
     private val beneficiaryService: BeneficiaryService,
     private val thirdPartyTransferService: ThirdPartyTransferService,
-    private val ktorSavingsAccountService: KtorSavingsAccountService
+    private val ktorSavingsAccountService: KtorSavingsAccountService,
 ) {
     val authenticationApi: AuthenticationService
         get() = authenticationService
diff --git a/core/network/src/main/kotlin/org/mifospay/core/network/di/NetworkModule.kt b/core/network/src/main/kotlin/org/mifospay/core/network/di/NetworkModule.kt
index b896a9d50..a58ba87a5 100644
--- a/core/network/src/main/kotlin/org/mifospay/core/network/di/NetworkModule.kt
+++ b/core/network/src/main/kotlin/org/mifospay/core/network/di/NetworkModule.kt
@@ -116,7 +116,7 @@ class NetworkModule {
         @Named("FineractThirdPartyTransferService") thirdPartyTransferService: ThirdPartyTransferService,
         standingInstructionService: StandingInstructionService,
         notificationService: NotificationService,
-        ktorSavingsAccountService: KtorSavingsAccountService
+        ktorSavingsAccountService: KtorSavingsAccountService,
     ): FineractApiManager {
         return FineractApiManager(
             authenticationService,
@@ -135,7 +135,7 @@ class NetworkModule {
             thirdPartyTransferService,
             standingInstructionService,
             notificationService,
-            ktorSavingsAccountService
+            ktorSavingsAccountService,
         )
     }
 
@@ -157,7 +157,7 @@ class NetworkModule {
             registrationService,
             beneficiaryService,
             thirdPartyTransferService,
-            ktorSavingsAccountService
+            ktorSavingsAccountService,
         )
     }
 
@@ -195,7 +195,7 @@ class NetworkModule {
     @Provides
     @Singleton
     fun providesKtorSavingsAccountService(
-        client: HttpClient
+        client: HttpClient,
     ): KtorSavingsAccountService {
         return KtorSavingsAccountService(client)
     }
diff --git a/core/network/src/main/kotlin/org/mifospay/core/network/services/KtorAuthenticationService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/KtorAuthenticationService.kt
index 9cbdc8b35..47a93bf53 100644
--- a/core/network/src/main/kotlin/org/mifospay/core/network/services/KtorAuthenticationService.kt
+++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/KtorAuthenticationService.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md
+ */
 package org.mifospay.core.network.services
 
 import com.mifospay.core.model.domain.user.User
diff --git a/core/network/src/main/kotlin/org/mifospay/core/network/services/KtorSavingsAccountService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/KtorSavingsAccountService.kt
index 6f09605c8..b0fc43c16 100644
--- a/core/network/src/main/kotlin/org/mifospay/core/network/services/KtorSavingsAccountService.kt
+++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/KtorSavingsAccountService.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md
+ */
 package org.mifospay.core.network.services
 
 import com.mifospay.core.model.entity.Page
@@ -12,7 +21,8 @@ import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
 import jakarta.inject.Inject
-import org.mifospay.core.network.ApiEndPoints
+import org.mifospay.core.network.ApiEndPoints.SAVINGS_ACCOUNTS
+import org.mifospay.core.network.ApiEndPoints.TRANSACTIONS
 import org.mifospay.core.network.BaseURL
 import org.mifospay.core.network.GenericResponse
 
@@ -23,7 +33,7 @@ class KtorSavingsAccountService @Inject constructor(
         accountId: Long,
         associationType: String,
     ): SavingsWithAssociations {
-        return client.get("${BaseURL().selfServiceUrl}${ApiEndPoints.SAVINGS_ACCOUNTS}/$accountId") {
+        return client.get("${BaseURL().selfServiceUrl}$SAVINGS_ACCOUNTS/$accountId") {
             url {
                 parameters.append("associations", associationType)
             }
@@ -31,7 +41,7 @@ class KtorSavingsAccountService @Inject constructor(
     }
 
     suspend fun getSavingsAccounts(limit: Int): Page<SavingsWithAssociations> {
-        return client.get("${BaseURL().selfServiceUrl}${ApiEndPoints.SAVINGS_ACCOUNTS}") {
+        return client.get("${BaseURL().selfServiceUrl}$SAVINGS_ACCOUNTS") {
             url {
                 parameters.append("limit", limit.toString())
             }
@@ -39,14 +49,14 @@ class KtorSavingsAccountService @Inject constructor(
     }
 
     suspend fun createSavingsAccount(savingAccount: SavingAccount): GenericResponse {
-        return client.post("${BaseURL().selfServiceUrl}${ApiEndPoints.SAVINGS_ACCOUNTS}") {
+        return client.post("${BaseURL().selfServiceUrl}$SAVINGS_ACCOUNTS") {
             contentType(ContentType.Application.Json)
             setBody(savingAccount)
         }.body()
     }
 
     suspend fun blockUnblockAccount(accountId: Long, command: String?): GenericResponse {
-        return client.post("${BaseURL().selfServiceUrl}${ApiEndPoints.SAVINGS_ACCOUNTS}/$accountId") {
+        return client.post("${BaseURL().selfServiceUrl}$SAVINGS_ACCOUNTS/$accountId") {
             url {
                 parameters.append("command", command ?: "")
             }
@@ -54,16 +64,19 @@ class KtorSavingsAccountService @Inject constructor(
     }
 
     suspend fun getSavingAccountTransaction(accountId: Long, transactionId: Long): Transactions {
-        return client.get("${BaseURL().selfServiceUrl}${ApiEndPoints.SAVINGS_ACCOUNTS}/$accountId/${ApiEndPoints.TRANSACTIONS}/$transactionId")
-            .body()
+        return client.get(
+            urlString = "${BaseURL().selfServiceUrl}$SAVINGS_ACCOUNTS/" +
+                "$accountId/$TRANSACTIONS/$transactionId",
+        ).body()
     }
 
     suspend fun payViaMobile(accountId: Long): Transactions {
-        return client.post("${BaseURL().selfServiceUrl}${ApiEndPoints.SAVINGS_ACCOUNTS}/$accountId/${ApiEndPoints.TRANSACTIONS}") {
+        return client.post(
+            urlString = "${BaseURL().selfServiceUrl}$SAVINGS_ACCOUNTS/$accountId/$TRANSACTIONS",
+        ) {
             url {
                 parameters.append("command", "deposit")
             }
         }.body()
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/kotlin/org/mifospay/core/network/services/SavingsAccountsService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/SavingsAccountsService.kt
index d8071dfe5..690658bce 100644
--- a/core/network/src/main/kotlin/org/mifospay/core/network/services/SavingsAccountsService.kt
+++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/SavingsAccountsService.kt
@@ -9,6 +9,4 @@
  */
 package org.mifospay.core.network.services
 
-interface SavingsAccountsService {
-
-}
+interface SavingsAccountsService
diff --git a/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginScreen.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginScreen.kt
index 8084be8fa..efc373fe5 100644
--- a/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginScreen.kt
+++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginScreen.kt
@@ -60,7 +60,7 @@ internal fun LoginScreen(
     navigateToPasscodeScreen: () -> Unit,
     modifier: Modifier = Modifier,
     viewModel: LoginViewModel = hiltViewModel(),
-    navigateToSignupScreen: () -> Unit
+    navigateToSignupScreen: () -> Unit,
 ) {
     val context = LocalContext.current
     val showProgress by viewModel.showProgress.collectAsStateWithLifecycle()
@@ -78,7 +78,7 @@ internal fun LoginScreen(
                 },
             )
         },
-        navigateToSignupScreen = navigateToSignupScreen
+        navigateToSignupScreen = navigateToSignupScreen,
     )
 
     if (isLoginSuccess) {
@@ -92,7 +92,7 @@ private fun LoginScreenContent(
     showProgress: Boolean,
     login: (username: String, password: String) -> Unit,
     modifier: Modifier = Modifier,
-    navigateToSignupScreen: () -> Unit
+    navigateToSignupScreen: () -> Unit,
 ) {
     var showSignUpScreen by rememberSaveable { mutableStateOf(false) }
 
@@ -110,7 +110,7 @@ private fun LoginScreenContent(
 
     if (showSignUpScreen) {
         SocialSignupMethodContentScreen(
-            navigateToSignupScreen = navigateToSignupScreen
+            navigateToSignupScreen = navigateToSignupScreen,
         ) {
             showSignUpScreen = false
         }
@@ -245,7 +245,7 @@ private fun LoanScreenPreview() {
         LoginScreenContent(
             showProgress = false,
             login = { _, _ -> },
-            navigateToSignupScreen = {}
+            navigateToSignupScreen = {},
         )
     }
 }
diff --git a/feature/auth/src/main/kotlin/org/mifospay/feature/auth/navigation/LoginScreenNavigation.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/navigation/LoginScreenNavigation.kt
index 511608bd2..ef1c44d0f 100644
--- a/feature/auth/src/main/kotlin/org/mifospay/feature/auth/navigation/LoginScreenNavigation.kt
+++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/navigation/LoginScreenNavigation.kt
@@ -23,7 +23,7 @@ fun NavGraphBuilder.loginScreen(
     composable(route = LOGIN_ROUTE) {
         LoginScreen(
             navigateToPasscodeScreen = onNavigateToPasscodeScreen,
-            navigateToSignupScreen = onNavigateToSignupScreen
+            navigateToSignupScreen = onNavigateToSignupScreen,
         )
     }
 }
diff --git a/feature/auth/src/main/kotlin/org/mifospay/feature/auth/socialSignup/SocialSignupMethodScreen.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/socialSignup/SocialSignupMethodScreen.kt
index c5479b0aa..f7bc19203 100644
--- a/feature/auth/src/main/kotlin/org/mifospay/feature/auth/socialSignup/SocialSignupMethodScreen.kt
+++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/socialSignup/SocialSignupMethodScreen.kt
@@ -72,14 +72,14 @@ const val TAG = "Social Login"
 // Keeping until we fix sign up
 @Composable
 internal fun SocialSignupMethodContentScreen(
-    navigateToSignupScreen: () -> Unit = {},
     modifier: Modifier = Modifier,
+    navigateToSignupScreen: () -> Unit = {},
     onDismissSignUp: () -> Unit = {},
 ) {
     SocialSignupMethodScreen(
         modifier = modifier,
         onDismissSignUp = onDismissSignUp,
-        navigateToSignupScreen = navigateToSignupScreen
+        navigateToSignupScreen = navigateToSignupScreen,
     )
 }
 
@@ -188,7 +188,7 @@ private fun SocialSignupMethodScreen(
                     mifosSavingProductId = MIFOS_CONSUMER_SAVINGS_PRODUCT_ID
                     signUp(checkedGoogleAccount)
                 },
-                navigateToSignupScreen=navigateToSignupScreen
+                navigateToSignupScreen = navigateToSignupScreen,
             )
         },
         onDismiss = {
@@ -224,9 +224,9 @@ private fun SignupMethodContentScreen(
             MifosOutlinedButton(
                 modifier = Modifier.padding(top = 48.dp),
                 onClick = {
-                    if(checkedGoogleAccountState){
+                    if (checkedGoogleAccountState) {
                         onSignUpAsMerchant.invoke(checkedGoogleAccountState)
-                    }else{
+                    } else {
                         navigateToSignupScreen.invoke()
                     }
                 },
@@ -269,9 +269,9 @@ private fun SignupMethodContentScreen(
             MifosOutlinedButton(
                 modifier = Modifier.padding(top = 24.dp),
                 onClick = {
-                    if(checkedGoogleAccountState){
+                    if (checkedGoogleAccountState) {
                         onSignupAsCustomer.invoke(checkedGoogleAccountState)
-                    }else{
+                    } else {
                         navigateToSignupScreen.invoke()
                     }
                 },
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a1fcac35b..88d3d2a5e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,33 +1,36 @@
 [versions]
 accompanistPagerVersion = "0.34.0"
+activityVersion = "1.9.1"
+androidDesugarJdkLibs = "2.0.4"
 androidGradlePlugin = "8.5.2"
 androidTools = "31.5.2"
+androidx-test-ext-junit = "1.2.1"
 androidxActivity = "1.9.1"
+androidxBrowser = "1.8.0"
 androidxComposeBom = "2024.08.00"
 androidxComposeCompiler = "1.5.15"
+androidxComposeMaterial3Adaptive = "1.0.0-rc01"
+androidxComposeRuntime = "1.6.8"
+androidxComposeRuntimeTracing = "1.0.0-beta01"
 androidxComposeUi = "1.6.8"
 androidxComposeUiTest = "1.7.0-beta01"
-androidxComposeRuntime = "1.6.8"
-appcompatVersion = "1.7.0"
+androidxCoreSplashscreen = "1.0.1"
+androidxDataStore = "1.1.1"
 androidxHilt = "1.2.0"
 androidxLifecycle = "2.8.4"
-androidxComposeMaterial3Adaptive = "1.0.0-rc01"
-androidxComposeRuntimeTracing = "1.0.0-beta01"
-androidxCoreSplashscreen = "1.0.1"
+androidxMetrics = "1.0.0-beta01"
 androidxNavigation = "2.8.0-rc01"
 androidxProfileinstaller = "1.3.1"
 androidxTracing = "1.3.0-alpha02"
-androidxMetrics = "1.0.0-beta01"
-androidxBrowser = "1.8.0"
-activityVersion = "1.9.1"
-androidDesugarJdkLibs = "2.0.4"
-androidx-test-ext-junit = "1.2.1"
-androidxDataStore = "1.1.1"
+appcompatVersion = "1.7.0"
+cameraLifecycleVersion = "1.3.4"
+cameraViewVersion = "1.3.4"
 coil = "2.6.0"
+compileSdk = "34"
+compose-plugin = "1.6.11"
 coreKtxVersion = "1.13.1"
 credentialsVersion = "1.2.2"
-cameraViewVersion = "1.3.4"
-cameraLifecycleVersion = "1.3.4"
+datastore = "1.1.1"
 dependencyGuard = "0.5.0"
 detekt = "1.23.5"
 espresso-core = "3.6.1"
@@ -40,243 +43,195 @@ googleOssPlugin = "0.10.6"
 googleidVersion = "1.1.1"
 hilt = "2.52"
 junitVersion = "4.13.2"
+koin = "3.6.0-Beta4"
+koinComposeMultiplatform = "1.2.0-Beta4"
 kotlin = "2.0.20"
 kotlinStdlibVersion = "1.9.0"
-kotlinxSerializationJsonVersion = "1.3.0"
-ksp = "2.0.20-1.0.24"
-kotlinxDatetime = "0.6.0"
-kotlinxSerializationJson = "1.7.1"
 kotlinxCoroutines = "1.8.1"
+kotlinxDatetime = "0.6.0"
 kotlinxImmutable = "0.3.7"
-ktorClientAndroid = "2.3.4"
-ktorClientAndroidVersion = "1.6.3"
-ktorClientContentNegotiationVersion = "2.3.4"
-ktorClientCoreVersion = "2.3.4"
-ktorClientJsonVersion = "2.3.4"
-ktorClientSerialization = "2.3.4"
-ktorClientLoggingVersion = "2.3.4"
-ktorClientSerializationVersion = "1.6.3"
-ktorClientWebsocketsVersion = "2.3.4"
-ktorSerializationKotlinxJsonVersion = "2.3.4"
+kotlinxSerializationJson = "1.7.1"
+kotlinxSerializationJsonVersion = "1.3.0"
+ksp = "2.0.20-1.0.24"
+ktlint = "12.1.1"
+ktorVersion = "2.3.4"
 libphonenumberAndroidVersion = "8.13.35"
-lifecycleVersion = "2.8.4"
 lifecycleExtensionsVersion = "2.2.0"
+lifecycleVersion = "2.8.4"
 logbackClassicVersion = "1.2.3"
+minSdk = "24"
 moduleGraph = "2.5.0"
 okHttp3Version = "4.12.0"
 playServicesAuthVersion = "21.2.0"
 playServicesCodeScanner = "16.1.0"
 protobuf = "4.26.0"
 protobufPlugin = "0.9.4"
+retrofitKotlinxSerializationJson = "1.0.0"
 retrofitVersion = "2.11.0"
+roborazzi = "1.26.0"
+room = "2.6.1"
 rxandroidVersion = "1.1.0"
 rxjavaVersion = "1.3.8"
-room = "2.6.1"
-roborazzi = "1.26.0"
-retrofitKotlinxSerializationJson = "1.0.0"
-spotlessVersion = "6.23.3"
-sheets_compose_dialogs_core = "1.3.0"
 secrets = "2.0.1"
+sheets_compose_dialogs_core = "1.3.0"
+spotlessVersion = "6.23.3"
+targetSdk = "34"
 truth = "1.4.2"
 twitter-detekt-compose = "0.0.26"
-zxingVersion = "3.5.3"
-# Multiplatform Dependencies
-compose-plugin = "1.6.11"
-
-koin = "3.6.0-Beta4"
-koinComposeMultiplatform = "1.2.0-Beta4"
-
-datastore = "1.1.1"
+versionCatalogLinterVersion = "1.0.3"
 wire = "5.0.0"
-
-compileSdk = "34"
-minSdk = "24"
-targetSdk = "34"
-
-[bundles]
-androidx-compose-ui-test = ["androidx-compose-ui-test", "androidx-compose-ui-test-manifest"]
+zxingVersion = "3.5.3"
 
 [libraries]
-jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlinStdlibVersion" }
-koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
-koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
-koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
-koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koinComposeMultiplatform" }
-koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koinComposeMultiplatform" }
-
-accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanistPagerVersion" }
-
-androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityVersion" }
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
-
-androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidxComposeCompiler" }
-
-androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompatVersion" }
-androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtxVersion" }
-androidx-credentials = { module = "androidx.credentials:credentials", version.ref = "credentialsVersion" }
-androidx-credentials-play-services-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "credentialsVersion" }
+accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanistPagerVersion" }
 android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
-androidx-metrics = { group = "androidx.metrics", name = "metrics-performance", version.ref = "androidxMetrics" }
+android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
+android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }
+androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activityVersion" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompatVersion" }
 androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidxBrowser" }
-androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" }
-androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" }
-androidx-navigation-testing = { group = "androidx.navigation", name = "navigation-testing", version.ref = "androidxNavigation" }
-androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfileinstaller" }
-androidx-dataStore-core = { group = "androidx.datastore", name = "datastore", version.ref = "androidxDataStore" }
-
-androidx-tracing-ktx = { group = "androidx.tracing", name = "tracing-ktx", version.ref = "androidxTracing" }
-androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
-
+androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "cameraLifecycleVersion" }
+androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "cameraViewVersion" }
+androidx-compose-animation = { group = "androidx.compose.animation", name = "animation" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
+androidx-compose-compiler = { group = "androidx.compose.compiler", name = "compiler", version.ref = "androidxComposeCompiler" }
 androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
 androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
-androidx-compose-animation = { group = "androidx.compose.animation", name = "animation" }
-androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref="androidxComposeUi" }
-androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxComposeUiTest" }
-androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
-androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref="androidxComposeUi" }
-androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-
-androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
-androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive", version.ref = "androidxComposeMaterial3Adaptive" }
 androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidxComposeMaterial3Adaptive" }
 androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidxComposeMaterial3Adaptive" }
-
-androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref="androidxComposeRuntime" }
+androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
+androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidxComposeRuntime" }
 androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }
-
-androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHilt" }
+androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxComposeUi" }
+androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxComposeUiTest" }
+androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "androidxComposeUi" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtxVersion" }
+androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" }
+androidx-credentials = { group = "androidx.credentials", name = "credentials", version.ref = "credentialsVersion" }
+androidx-credentials-play-services-auth = { group = "androidx.credentials", name = "credentials-play-services-auth", version.ref = "credentialsVersion" }
+androidx-dataStore-core = { group = "androidx.datastore", name = "datastore", version.ref = "androidxDataStore" }
+androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHilt" }
+androidx-lifecycle-extensions = { group = "androidx.lifecycle", name = "lifecycle-extensions", version.ref = "lifecycleExtensionsVersion" }
+androidx-lifecycle-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleVersion" }
 androidx-lifecycle-runtimeCompose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycle" }
-androidx-lifecycle-viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" }
 androidx-lifecycle-runtimeTesting = { group = "androidx.lifecycle", name = "lifecycle-runtime-testing", version.ref = "androidxLifecycle" }
-androidx-lifecycle-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleVersion" }
-androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycleExtensionsVersion" }
-
+androidx-lifecycle-viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" }
+androidx-metrics = { group = "androidx.metrics", name = "metrics-performance", version.ref = "androidxMetrics" }
+androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" }
+androidx-navigation-testing = { group = "androidx.navigation", name = "navigation-testing", version.ref = "androidxNavigation" }
+androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfileinstaller" }
+androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
+androidx-tracing-ktx = { group = "androidx.tracing", name = "tracing-ktx", version.ref = "androidxTracing" }
 coil-kt = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
 coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
-
+compose-gradlePlugin = { group = "org.jetbrains.kotlin", name = "compose-compiler-gradle-plugin", version.ref = "kotlin" }
+datastore = { group = "androidx.datastore", name = "datastore-core-okio", version.ref = "datastore" }
+detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
+detekt-gradlePlugin = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gradle-plugin", version.ref = "detekt" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
-
-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
 firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" }
+firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
 firebase-cloud-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx" }
 firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" }
+firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" }
 firebase-performance = { group = "com.google.firebase", name = "firebase-perf-ktx" }
-
+firebase-performance-gradlePlugin = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" }
 google-oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "googleOss" }
 google-oss-licenses-plugin = { group = "com.google.android.gms", name = "oss-licenses-plugin", version.ref = "googleOssPlugin" }
-googleid = { module = "com.google.android.libraries.identity.googleid:googleid", version.ref = "googleidVersion" }
 google-play-services-code-scanner = { group = "com.google.android.gms", name = "play-services-code-scanner", version.ref = "playServicesCodeScanner" }
-
+googleid = { group = "com.google.android.libraries.identity.googleid", name = "googleid", version.ref = "googleidVersion" }
 hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
 hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" }
 hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
-
-junit = { module = "junit:junit", version.ref = "junitVersion" }
-
+jetbrains-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinStdlibVersion" }
+junit = { group = "junit", name = "junit", version.ref = "junitVersion" }
+koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
+koin-androidx-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
+koin-compose = { group = "io.insert-koin", name = "koin-compose", version.ref = "koinComposeMultiplatform" }
+koin-compose-viewmodel = { group = "io.insert-koin", name = "koin-compose-viewmodel", version.ref = "koinComposeMultiplatform" }
+koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
+kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "kotlinxImmutable" }
+kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
-kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
-kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
-kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "kotlinxImmutable" }
-
-kotlinx-serialization-json-v130 = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJsonVersion" }
-ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktorClientAndroid" }
-ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorClientContentNegotiationVersion" }
-ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorClientCoreVersion" }
-ktor-client-json = { module = "io.ktor:ktor-client-json", version.ref = "ktorClientJsonVersion" }
-ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktorClientLoggingVersion" }
-ktor-client-serialization = { module = "io.ktor:ktor-client-serialization", version.ref = "ktorClientSerialization" }
-ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorSerializationKotlinxJsonVersion" }
-ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktorClientWebsocketsVersion" }
-
+ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
+ktlint-gradlePlugin = { group = "org.jlleitschuh.gradle", name = "ktlint-gradle", version.ref = "ktlint" }
+ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktorVersion" }
+ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktorVersion" }
+ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktorVersion" }
+ktor-client-json = { group = "io.ktor", name = "ktor-client-json", version.ref = "ktorVersion" }
+ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktorVersion" }
+ktor-client-serialization = { group = "io.ktor", name = "ktor-client-serialization", version.ref = "ktorVersion" }
+ktor-client-websockets = { group = "io.ktor", name = "ktor-client-websockets", version.ref = "ktorVersion" }
+ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktorVersion" }
+libphonenumber-android = { group = "io.michaelrocks", name = "libphonenumber-android", version.ref = "libphonenumberAndroidVersion" }
 lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "androidTools" }
 lint-checks = { group = "com.android.tools.lint", name = "lint-checks", version.ref = "androidTools" }
 lint-tests = { group = "com.android.tools.lint", name = "lint-tests", version.ref = "androidTools" }
-
-libphonenumber-android = { module = "io.michaelrocks:libphonenumber-android", version.ref = "libphonenumberAndroidVersion" }
-
-logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logbackClassicVersion" }
-play-services-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServicesAuthVersion" }
-
+logback-classic = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logbackClassicVersion" }
+play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "playServicesAuthVersion" }
 protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" }
 protobuf-protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" }
-
-reactivex-rxjava-android = { module = "io.reactivex:rxandroid", version.ref = "rxandroidVersion" }
-reactivex-rxjava = { module = "io.reactivex:rxjava", version.ref = "rxjavaVersion" }
-
+reactivex-rxjava = { group = "io.reactivex", name = "rxjava", version.ref = "rxjavaVersion" }
+reactivex-rxjava-android = { group = "io.reactivex", name = "rxandroid", version.ref = "rxandroidVersion" }
 retrofit-kotlin-serialization = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinxSerializationJson" }
-
-sheets-compose-dialogs-core = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "core", version.ref = "sheets_compose_dialogs_core" }
+room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "room" }
 sheets-compose-dialogs-calender = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "calendar", version.ref = "sheets_compose_dialogs_core" }
-
-squareup-retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofitVersion" }
-squareup-retrofit-adapter-rxjava = { module = "com.squareup.retrofit2:adapter-rxjava", version.ref = "retrofitVersion" }
-squareup-retrofit-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofitVersion" }
-squareup-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okHttp3Version" }
-squareup-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okHttp3Version" }
-
+sheets-compose-dialogs-core = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "core", version.ref = "sheets_compose_dialogs_core" }
+spotless-gradle = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotlessVersion" }
+squareup-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okHttp3Version" }
+squareup-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okHttp3Version" }
+squareup-retrofit-adapter-rxjava = { group = "com.squareup.retrofit2", name = "adapter-rxjava", version.ref = "retrofitVersion" }
+squareup-retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofitVersion" }
+squareup-retrofit2 = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofitVersion" }
 truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
-
-#Detekt
-detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
 twitter-detekt-compose = { group = "com.twitter.compose.rules", name = "detekt", version.ref = "twitter-detekt-compose" }
+zxing = { group = "com.google.zxing", name = "core", version.ref = "zxingVersion" }
 
-#Multiplatform Libraries
-datastore = { module = "androidx.datastore:datastore-core-okio", version.ref = "datastore" }
-
-# Dependencies of the included build-logic
-android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
-android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }
-androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "cameraViewVersion" }
-androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "cameraLifecycleVersion" }
-compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
-firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" }
-firebase-performance-gradlePlugin = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" }
-kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
-room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "room" }
-spotless-gradle = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotlessVersion" }
-zxing = { module = "com.google.zxing:core", version.ref = "zxingVersion" }
-
+[bundles]
+androidx-compose-ui-test = [
+    "androidx-compose-ui-test",
+    "androidx-compose-ui-test-manifest"
+]
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 dependencyGuard = { id = "com.dropbox.dependency-guard", version.ref = "dependencyGuard" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebasePerfPlugin" }
 gms = { id = "com.google.gms.google-services", version.ref = "gmsPlugin" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-module-graph = { id = "com.jraska.module.graph.assertion", version.ref = "moduleGraph" }
-protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }
-roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
-room = { id = "androidx.room", version.ref = "room" }
-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
-spotless = { id = "com.diffplug.spotless", version.ref = "spotlessVersion" }
-# Multiplatform Plugins
-wire = { id = "com.squareup.wire", version.ref = "wire" }
-
-# Plugins defined by this project
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
+mifos-detekt-plugin = { id = "mifos.detekt.plugin", version = "unspecified" }
+mifos-git-hooks = { id = "mifos.git.hooks", version = "unspecified" }
+mifos-ktlint-plugin = { id = "mifos.ktlint.plugin", version = "unspecified" }
+mifos-spotless-plugin = { id = "mifos.spotless.plugin", version = "unspecified" }
 mifospay-android-application = { id = "mifospay.android.application", version = "unspecified" }
-mifospay-android-application-flavors = { id = "mifospay.android.application.flavors", version = "unspecified" }
 mifospay-android-application-compose = { id = "mifospay.android.application.compose", version = "unspecified" }
 mifospay-android-application-firebase = { id = "mifospay.android.application.firebase", version = "unspecified" }
+mifospay-android-application-flavors = { id = "mifospay.android.application.flavors", version = "unspecified" }
 mifospay-android-feature = { id = "mifospay.android.feature", version = "unspecified" }
 mifospay-android-hilt = { id = "mifospay.android.hilt", version = "unspecified" }
 mifospay-android-library = { id = "mifospay.android.library", version = "unspecified" }
@@ -285,3 +240,11 @@ mifospay-android-lint = { id = "mifospay.android.lint", version = "unspecified"
 mifospay-android-room = { id = "mifospay.android.room", version = "unspecified" }
 mifospay-android-test = { id = "mifospay.android.test", version = "unspecified" }
 mifospay-jvm-library = { id = "mifospay.jvm.library", version = "unspecified" }
+module-graph = { id = "com.jraska.module.graph.assertion", version.ref = "moduleGraph" }
+protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }
+roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
+room = { id = "androidx.room", version.ref = "room" }
+secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
+spotless = { id = "com.diffplug.spotless", version.ref = "spotlessVersion" }
+version-catalog-linter = { id = "io.github.pemistahl.version-catalog-linter", version.ref = "versionCatalogLinterVersion" }
+wire = { id = "com.squareup.wire", version.ref = "wire" }
diff --git a/mifospay/dependencies/prodReleaseRuntimeClasspath.tree.txt b/mifospay/dependencies/prodReleaseRuntimeClasspath.tree.txt
index 1677ec592..b96d6758e 100644
--- a/mifospay/dependencies/prodReleaseRuntimeClasspath.tree.txt
+++ b/mifospay/dependencies/prodReleaseRuntimeClasspath.tree.txt
@@ -30,12 +30,13 @@
 |              |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.8.1
 |              |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 |              |         |         +--- org.jetbrains:annotations:23.0.0
-|              |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
-|              |         |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (c)
-|              |         |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1 (c)
-|              |         |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (c)
-|              |         |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.1 (c)
-|              |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.0.20 (*)
+|              |         |         \--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
+|              |         |              +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (c)
+|              |         |              +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1 (c)
+|              |         |              +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (c)
+|              |         |              +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.1 (c)
+|              |         |              +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.1 (c)
+|              |         |              \--- org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.8.1 (c)
 |              |         +--- androidx.lifecycle:lifecycle-common-java8:2.8.4 (c)
 |              |         +--- androidx.lifecycle:lifecycle-livedata:2.8.4 (c)
 |              |         +--- androidx.lifecycle:lifecycle-livedata-core:2.8.4 (c)
@@ -1193,10 +1194,8 @@
 |    |    |    +--- androidx.tracing:tracing-ktx:1.3.0-alpha02 (*)
 |    |    |    +--- com.google.dagger:hilt-android:2.52 (*)
 |    |    |    \--- com.squareup.retrofit2:converter-gson:2.11.0 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.20 (*)
 |    |    +--- androidx.tracing:tracing-ktx:1.3.0-alpha02 (*)
 |    |    +--- com.google.dagger:hilt-android:2.52 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1 (*)
 |    |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
 |    |    +--- com.squareup.okhttp3:logging-interceptor:4.12.0
 |    |    |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
@@ -1212,7 +1211,165 @@
 |    |    +--- com.squareup.retrofit2:converter-gson:2.11.0 (*)
 |    |    +--- io.reactivex:rxandroid:1.1.0
 |    |    |    \--- io.reactivex:rxjava:1.1.0 -> 1.3.8
-|    |    \--- io.reactivex:rxjava:1.3.8
+|    |    +--- io.reactivex:rxjava:1.3.8
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.0 -> 2.0.20 (*)
+|    |    +--- io.ktor:ktor-client-core:2.3.4
+|    |    |    \--- io.ktor:ktor-client-core-jvm:2.3.4
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1
+|    |    |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    |    |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1 (*)
+|    |    |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- io.ktor:ktor-http:2.3.4
+|    |    |         |    \--- io.ktor:ktor-http-jvm:2.3.4
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- io.ktor:ktor-utils:2.3.4
+|    |    |         |         |    \--- io.ktor:ktor-utils-jvm:2.3.4
+|    |    |         |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         |         +--- io.ktor:ktor-io:2.3.4
+|    |    |         |         |         |    \--- io.ktor:ktor-io-jvm:2.3.4
+|    |    |         |         |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         +--- io.ktor:ktor-events:2.3.4
+|    |    |         |    \--- io.ktor:ktor-events-jvm:2.3.4
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- io.ktor:ktor-http:2.3.4 (*)
+|    |    |         |         +--- io.ktor:ktor-utils:2.3.4 (*)
+|    |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         +--- io.ktor:ktor-websocket-serialization:2.3.4
+|    |    |         |    \--- io.ktor:ktor-websocket-serialization-jvm:2.3.4
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- io.ktor:ktor-http:2.3.4 (*)
+|    |    |         |         +--- io.ktor:ktor-serialization:2.3.4
+|    |    |         |         |    \--- io.ktor:ktor-serialization-jvm:2.3.4
+|    |    |         |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         |         +--- io.ktor:ktor-http:2.3.4 (*)
+|    |    |         |         |         +--- io.ktor:ktor-websockets:2.3.4
+|    |    |         |         |         |    \--- io.ktor:ktor-websockets-jvm:2.3.4
+|    |    |         |         |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         |         |         +--- io.ktor:ktor-http:2.3.4 (*)
+|    |    |         |         |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         \--- org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.7.2 -> 1.8.1
+|    |    |              +--- org.slf4j:slf4j-api:1.7.32 -> 1.7.36
+|    |    |              +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    |    |              +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1 (*)
+|    |    |              \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.0.20 (*)
+|    |    +--- io.ktor:ktor-client-android:2.3.4
+|    |    |    \--- io.ktor:ktor-client-android-jvm:2.3.4
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         +--- io.ktor:ktor-client-core:2.3.4 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    +--- io.ktor:ktor-client-serialization:2.3.4
+|    |    |    \--- io.ktor:ktor-client-serialization-jvm:2.3.4
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- io.ktor:ktor-client-core:2.3.4 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1 -> 1.7.1 (*)
+|    |    |         +--- io.ktor:ktor-client-json:2.3.4
+|    |    |         |    \--- io.ktor:ktor-client-json-jvm:2.3.4
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- io.ktor:ktor-client-core:2.3.4 (*)
+|    |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    +--- io.ktor:ktor-client-logging:2.3.4
+|    |    |    \--- io.ktor:ktor-client-logging-jvm:2.3.4
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- io.ktor:ktor-client-core:2.3.4 (*)
+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    +--- io.ktor:ktor-client-content-negotiation:2.3.4
+|    |    |    \--- io.ktor:ktor-client-content-negotiation-jvm:2.3.4
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- io.ktor:ktor-client-core:2.3.4 (*)
+|    |    |         +--- io.ktor:ktor-serialization:2.3.4 (*)
+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    +--- io.ktor:ktor-client-json:2.3.4 (*)
+|    |    +--- io.ktor:ktor-client-websockets:2.3.4
+|    |    |    \--- io.ktor:ktor-client-websockets-jvm:2.3.4
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- io.ktor:ktor-client-core:2.3.4 (*)
+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    +--- io.ktor:ktor-serialization-kotlinx-json:2.3.4
+|    |    |    \--- io.ktor:ktor-serialization-kotlinx-json-jvm:2.3.4
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         +--- io.ktor:ktor-http:2.3.4 (*)
+|    |    |         +--- io.ktor:ktor-serialization-kotlinx:2.3.4
+|    |    |         |    \--- io.ktor:ktor-serialization-kotlinx-jvm:2.3.4
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*)
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- org.slf4j:slf4j-api:1.7.36
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+|    |    |         |         +--- io.ktor:ktor-http:2.3.4 (*)
+|    |    |         |         +--- io.ktor:ktor-serialization:2.3.4 (*)
+|    |    |         |         +--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1 -> 1.7.1 (*)
+|    |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    |         +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1 -> 1.7.1 (*)
+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 2.0.20 (*)
+|    |    \--- ch.qos.logback:logback-classic:1.2.3
+|    |         +--- ch.qos.logback:logback-core:1.2.3
+|    |         \--- org.slf4j:slf4j-api:1.7.25 -> 1.7.36
 |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.20 (*)
 |    +--- androidx.tracing:tracing-ktx:1.3.0-alpha02 (*)
 |    +--- com.google.dagger:hilt-android:2.52 (*)
diff --git a/mifospay/dependencies/prodReleaseRuntimeClasspath.txt b/mifospay/dependencies/prodReleaseRuntimeClasspath.txt
index e408163a2..6dc1ab157 100644
--- a/mifospay/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/mifospay/dependencies/prodReleaseRuntimeClasspath.txt
@@ -184,6 +184,8 @@ androidx.window.extensions.core:core:1.0.0
 androidx.window:window-core-android:1.3.0-rc01
 androidx.window:window-core:1.3.0-rc01
 androidx.window:window:1.3.0-rc01
+ch.qos.logback:logback-classic:1.2.3
+ch.qos.logback:logback-core:1.2.3
 co.touchlab:stately-concurrency-jvm:2.0.6
 co.touchlab:stately-concurrency:2.0.6
 co.touchlab:stately-concurrent-collections-jvm:2.0.6
@@ -283,6 +285,38 @@ io.insert-koin:koin-compose-viewmodel:1.2.0-Beta4
 io.insert-koin:koin-compose:1.2.0-Beta4
 io.insert-koin:koin-core-jvm:3.6.0-Beta4
 io.insert-koin:koin-core:3.6.0-Beta4
+io.ktor:ktor-client-android-jvm:2.3.4
+io.ktor:ktor-client-android:2.3.4
+io.ktor:ktor-client-content-negotiation-jvm:2.3.4
+io.ktor:ktor-client-content-negotiation:2.3.4
+io.ktor:ktor-client-core-jvm:2.3.4
+io.ktor:ktor-client-core:2.3.4
+io.ktor:ktor-client-json-jvm:2.3.4
+io.ktor:ktor-client-json:2.3.4
+io.ktor:ktor-client-logging-jvm:2.3.4
+io.ktor:ktor-client-logging:2.3.4
+io.ktor:ktor-client-serialization-jvm:2.3.4
+io.ktor:ktor-client-serialization:2.3.4
+io.ktor:ktor-client-websockets-jvm:2.3.4
+io.ktor:ktor-client-websockets:2.3.4
+io.ktor:ktor-events-jvm:2.3.4
+io.ktor:ktor-events:2.3.4
+io.ktor:ktor-http-jvm:2.3.4
+io.ktor:ktor-http:2.3.4
+io.ktor:ktor-io-jvm:2.3.4
+io.ktor:ktor-io:2.3.4
+io.ktor:ktor-serialization-jvm:2.3.4
+io.ktor:ktor-serialization-kotlinx-json-jvm:2.3.4
+io.ktor:ktor-serialization-kotlinx-json:2.3.4
+io.ktor:ktor-serialization-kotlinx-jvm:2.3.4
+io.ktor:ktor-serialization-kotlinx:2.3.4
+io.ktor:ktor-serialization:2.3.4
+io.ktor:ktor-utils-jvm:2.3.4
+io.ktor:ktor-utils:2.3.4
+io.ktor:ktor-websocket-serialization-jvm:2.3.4
+io.ktor:ktor-websocket-serialization:2.3.4
+io.ktor:ktor-websockets-jvm:2.3.4
+io.ktor:ktor-websockets:2.3.4
 io.michaelrocks:libphonenumber-android:8.13.35
 io.reactivex:rxandroid:1.1.0
 io.reactivex:rxjava:1.3.8
@@ -312,7 +346,9 @@ org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.0
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.0
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.1
@@ -321,3 +357,4 @@ org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.1
 org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.1
 org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1
 org.jetbrains:annotations:23.0.0
+org.slf4j:slf4j-api:1.7.36
diff --git a/mifospay/proguard-rules.pro b/mifospay/proguard-rules.pro
index d55f6b359..a767f4e67 100644
--- a/mifospay/proguard-rules.pro
+++ b/mifospay/proguard-rules.pro
@@ -39,4 +39,24 @@
 -dontwarn javax.lang.model.element.Modifier
 -dontwarn javax.lang.model.type.TypeMirror
 -dontwarn javax.lang.model.type.TypeVisitor
--dontwarn javax.lang.model.util.SimpleTypeVisitor7
\ No newline at end of file
+-dontwarn javax.lang.model.util.SimpleTypeVisitor7
+-dontwarn groovy.lang.GroovyObject
+-dontwarn groovy.lang.MetaClass
+-dontwarn java.lang.management.ManagementFactory
+-dontwarn javax.management.InstanceNotFoundException
+-dontwarn javax.management.MBeanRegistrationException
+-dontwarn javax.management.MBeanServer
+-dontwarn javax.management.MalformedObjectNameException
+-dontwarn javax.management.ObjectInstance
+-dontwarn javax.management.ObjectName
+-dontwarn javax.naming.Context
+-dontwarn javax.naming.InitialContext
+-dontwarn javax.naming.NamingException
+-dontwarn javax.servlet.ServletContainerInitializer
+-dontwarn org.codehaus.groovy.reflection.ClassInfo
+-dontwarn org.codehaus.groovy.runtime.BytecodeInterface8
+-dontwarn org.codehaus.groovy.runtime.ScriptBytecodeAdapter
+-dontwarn org.codehaus.groovy.runtime.callsite.CallSite
+-dontwarn org.codehaus.groovy.runtime.callsite.CallSiteArray
+-dontwarn org.codehaus.janino.ClassBodyEvaluator
+-dontwarn sun.reflect.Reflection
\ No newline at end of file
diff --git a/mifospay/src/main/java/org/mifospay/navigation/LoginNavGraph.kt b/mifospay/src/main/java/org/mifospay/navigation/LoginNavGraph.kt
index 7c8622ca5..c80043848 100644
--- a/mifospay/src/main/java/org/mifospay/navigation/LoginNavGraph.kt
+++ b/mifospay/src/main/java/org/mifospay/navigation/LoginNavGraph.kt
@@ -27,7 +27,7 @@ internal fun NavGraphBuilder.loginNavGraph(navController: NavController) {
     ) {
         loginScreen(
             onNavigateToPasscodeScreen = navController::navigateToPasscodeScreen,
-            onNavigateToSignupScreen = navController::navigateToSignup
+            onNavigateToSignupScreen = navController::navigateToSignup,
         )
 
         signupScreen(
diff --git a/scripts/pre-commit.sh b/scripts/pre-commit.sh
new file mode 100644
index 000000000..9ddd35a29
--- /dev/null
+++ b/scripts/pre-commit.sh
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Function to check the current branch
+check_current_branch() {
+    echo "\n🚀 Checking the current git branch..."
+    CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+    if [ "$CURRENT_BRANCH" = "master" ] || [ "$CURRENT_BRANCH" = "dev" ]; then
+        echo "🛑 Hold it right there! Committing directly to the '$CURRENT_BRANCH' branch? That's a big no-no!"
+        echo "🚫 Direct commits to '$CURRENT_BRANCH' are like trying to use a wrench to write code—doesn't work! 😜"
+        echo "\nABORTING COMMIT: You must navigate to a feature branch or create a new one to save the day! 🦸‍♂️🦸‍♀️\n"
+        exit 1
+    else
+        echo "✅ Fantastic! You're on the '$CURRENT_BRANCH' branch, which is perfect for commits. Let's keep this awesome momentum going! 🚀✨"
+    fi
+}
+
+# Function to run Spotless checks
+run_spotless_checks() {
+    echo "\n🚀 Spotless is now analyzing and formatting your code!"
+    ./gradlew spotlessApply --no-configuration-cache --daemon > /tmp/spotless-result
+    SPOTLESS_EXIT_CODE=$?
+
+    if [ ${SPOTLESS_EXIT_CODE} -ne 0 ]; then
+        cat /tmp/spotless-result
+        rm /tmp/spotless-result
+        echo "\n*********************************************************************************"
+        echo "   💥 Uh-oh! Spotless found formatting issues in the code! Time to tidy up! 💥"
+        echo "      💡 Tip: Check the reported issues and fix formatting errors. 🛠️"
+        echo "*********************************************************************************"
+        exit ${SPOTLESS_EXIT_CODE}
+    else
+        rm /tmp/spotless-result
+        echo "🎉 Stellar job! Your code is pristine and has passed Spotless's formatting checks without a hitch! Keep shining bright! ✨🚀"
+    fi
+}
+
+# Function to run ktlint checks
+run_dependency_guard() {
+    printf "\n🚀 Brace yourself! We're about to generate dependency guard baseline!"
+    ./gradlew dependencyGuardBaseline
+    KT_EXIT_CODE=$?
+
+    if [ ${KT_EXIT_CODE} -ne 0 ]; then
+        printf "\n*********************************************************************************"
+        echo "     💥 Oh no! Something went wrong! 💥"
+        echo "     💡 Unable to generate dependency baseline. 🛠️"
+        printf "*********************************************************************************\n"
+        exit ${KT_EXIT_CODE}
+    else
+        echo "🎉 Bravo! Dependency baseline has been generated successfully! Keep rocking that clean code! 🚀💫"
+    fi
+}
+
+# Function to run Detekt checks
+run_detekt_checks() {
+    echo "\n🚀 Detekt is now analyzing your Kotlin code for potential issues!"
+    ./gradlew detekt > /tmp/detekt-result
+    DETEKT_EXIT_CODE=$?
+
+    if [ ${DETEKT_EXIT_CODE} -ne 0 ]; then
+        cat /tmp/detekt-result
+        rm /tmp/detekt-result
+        echo "\n*********************************************************************************"
+        echo "     💥 Oh no! Detekt found issues in the code! Time to fix those issues! 💥"
+        echo "     💡 Tip: Review the Detekt report to resolve these issues. 🛠️"
+        echo "*********************************************************************************"
+        exit ${DETEKT_EXIT_CODE}
+    else
+        rm /tmp/detekt-result
+        echo "🎉 Fantastic work! Your Kotlin code has sailed through Detekt's analysis with ease! Onward to greatness! 🚀🌟"
+    fi
+}
+
+# Function to run Version Catalog checks
+run_version_catalog_checks() {
+    echo "\n🚀 Version catalog linter is now analyzing your catalog for potential issues!"
+    ./gradlew formatVersionCatalog
+    DETEKT_EXIT_CODE=$?
+
+    if [ ${DETEKT_EXIT_CODE} -ne 0 ]; then
+        echo "\n*********************************************************************************"
+        echo "     💥 Oh no! Version Catalog found issues in the code! Time to fix those issues! 💥"
+        echo "     💡 Tip: Review the Version Catalog logs to resolve these issues. 🛠️"
+        echo "*********************************************************************************"
+        exit ${DETEKT_EXIT_CODE}
+    else
+        echo "🎉 Fantastic work! Your Version catalog has been formatted successfully 🚀🌟"
+    fi
+}
+
+# Function to print success message
+print_success_message() {
+    GIT_USERNAME=$(git config user.name)
+    echo "\n *******************************************************************************"
+    echo "🚀🎉 Huzzah, $GIT_USERNAME! Your code has triumphed through the Style Checker Dragon unscathed! 🐉"
+    echo "Your code shines brighter than a supernova and sparkles like a constellation of stars! ✨🌌"
+    echo "*******************************************************************************"
+    echo "\n🚀🎉 Hold tight, $GIT_USERNAME! Your code is ready to commit and conquer new heights! 🌟✨ Keep up the amazing work! 💪\n"
+}
+
+# Main script execution
+check_current_branch
+run_spotless_checks
+run_detekt_checks
+run_dependency_guard
+run_version_catalog_checks
+print_success_message
+
+exit 0
diff --git a/scripts/pre-push.sh b/scripts/pre-push.sh
new file mode 100644
index 000000000..d2c0f6779
--- /dev/null
+++ b/scripts/pre-push.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Function to check the current branch
+check_current_branch() {
+    printf "\n🚀 Checking the current git branch..."
+    CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+    if [ "$CURRENT_BRANCH" = "master" ] || [ "$CURRENT_BRANCH" = "dev" ]; then
+        echo "🛑 Hold it right there! Committing directly to the '$CURRENT_BRANCH' branch? That's a big no-no!"
+        echo "🚫 Direct commits to '$CURRENT_BRANCH' are like trying to use a wrench to write code—doesn't work! 😜"
+        printf "\nABORTING COMMIT: You must navigate to a feature branch or create a new one to save the day! 🦸‍♂️🦸‍♀️\n"
+        exit 1
+    else
+        echo "✅ Fantastic! You're on the '$CURRENT_BRANCH' branch, which is perfect for commits. Let's keep this awesome momentum going! 🚀✨"
+    fi
+}
+
+# Function to run Spotless checks
+run_spotless_checks() {
+    printf "\n🚀 Spotless is now analyzing and formatting your code!"
+    ./gradlew spotlessCheck --daemon > /tmp/spotless-result
+    SPOTLESS_EXIT_CODE=$?
+
+    if [ ${SPOTLESS_EXIT_CODE} -ne 0 ]; then
+        cat /tmp/spotless-result
+        rm /tmp/spotless-result
+        printf "\n*********************************************************************************"
+        echo "   💥 Uh-oh! Spotless found formatting issues in the code! Time to tidy up! 💥"
+        echo "      💡 Tip: Check the reported issues and fix formatting errors. 🛠️"
+        echo "*********************************************************************************"
+        echo "🚀 Attempting to apply Spotless formatting fixes..."
+        ./gradlew spotlessApply --daemon
+    else
+        rm /tmp/spotless-result
+        echo "🎉 Stellar job! Your code is pristine and has passed Spotless's formatting checks without a hitch! Keep shining bright! ✨🚀"
+    fi
+}
+
+# Function to run Detekt checks
+run_detekt_checks() {
+    printf "\n🚀 Detekt is now analyzing your Kotlin code for potential issues!"
+    ./gradlew detekt > /tmp/detekt-result
+    DETEKT_EXIT_CODE=$?
+
+    if [ ${DETEKT_EXIT_CODE} -ne 0 ]; then
+        cat /tmp/detekt-result
+        rm /tmp/detekt-result
+        printf "\n*********************************************************************************"
+        echo "     💥 Oh no! Detekt found issues in the code! Time to fix those issues! 💥"
+        echo "     💡 Tip: Review the Detekt report to resolve these issues. 🛠️"
+        echo "*********************************************************************************"
+        exit ${DETEKT_EXIT_CODE}
+    else
+        rm /tmp/detekt-result
+        echo "🎉 Fantastic work! Your Kotlin code has sailed through Detekt's analysis with ease! Onward to greatness! 🚀🌟"
+    fi
+}
+
+# Function to run ktlint checks
+run_dependency_guard() {
+    printf "\n🚀 Brace yourself! We're about to generate dependency guard baseline!"
+    ./gradlew dependencyGuard
+    KT_EXIT_CODE=$?
+
+    if [ ${KT_EXIT_CODE} -ne 0 ]; then
+        printf "\n*********************************************************************************"
+        echo "     💥 Oh no! Something went wrong! 💥"
+        echo "     💡 Unable to generate dependency baseline. 🛠️"
+        printf "*********************************************************************************\n"
+        echo "🚀 Attempting to generate dependency baseline again..."
+        ./gradlew dependencyGuardBaseline
+    else
+        echo "🎉 Bravo! Dependency baseline has been generated successfully! Keep rocking that clean code! 🚀💫"
+    fi
+}
+
+# Function to run Version Catalog checks
+run_version_catalog_checks() {
+    echo "\n🚀 Version catalog linter is now analyzing your catalog for potential issues!"
+    ./gradlew checkVersionCatalog
+    DETEKT_EXIT_CODE=$?
+
+    if [ ${DETEKT_EXIT_CODE} -ne 0 ]; then
+        echo "\n*********************************************************************************"
+        echo "     💥 Oh no! Version Catalog found issues in the code! Time to fix those issues! 💥"
+        echo "     💡 Tip: Review the Version Catalog logs to resolve these issues. 🛠️"
+        echo "*********************************************************************************"
+        echo "🚀 Attempting to format the Version Catalog again..."
+        ./gradlew formatVersionCatalog
+    else
+        echo "🎉 Fantastic work! Your Version catalog has been formatted successfully 🚀🌟"
+    fi
+}
+
+# Function to print success message
+print_success_message() {
+    GIT_USERNAME=$(git config user.name)
+    printf "\n *******************************************************************************"
+    echo "🚀🎉 Huzzah, $GIT_USERNAME! Your code has triumphed through the Style Checker Dragon unscathed! 🐉"
+    echo "Your code shines brighter than a supernova and sparkles like a constellation of stars! ✨🌌"
+    echo "*******************************************************************************"
+    echo "\n🚀🎉 Get ready, $GIT_USERNAME! Your code is about to take flight into the repository cosmos! 🌟✨ Fasten your seatbelt for a stellar push! 🚀💫\n"
+}
+
+# Main script execution
+check_current_branch
+run_spotless_checks
+run_detekt_checks
+run_dependency_guard
+run_version_catalog_checks
+print_success_message
+
+exit 0