fix: solve conflicts

Author: jvsena42

app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt

@@ -91,7 +91,8 @@ fun SpendingConfirmScreen(
         onPermissionChange = { granted ->
             settingsViewModel.setNotificationPreference(granted)
         },
-        showPermissionDialog = false)
+        showPermissionDialog = false
+    )
 
     Content(
         onBackClick = onBackClick,

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveLiquidityScreen.kt

@@ -45,12 +45,15 @@ fun ReceiveLiquidityScreen(
     hasNotificationPermission: Boolean,
     modifier: Modifier = Modifier,
     isAdditional: Boolean = false,
-    settingsViewModel: SettingsViewModel = hiltViewModel()
+    settingsViewModel: SettingsViewModel = hiltViewModel(),
 ) {
 
-    RequestNotificationPermissions(showPermissionDialog = false) { granted ->
-        settingsViewModel.setNotificationPreference(granted)
-    }
+    RequestNotificationPermissions(
+        onPermissionChange = { granted ->
+            settingsViewModel.setNotificationPreference(granted)
+        },
+        showPermissionDialog = false
+    )
 
     Content(
         entry = entry,