fix: solve conflicts

jvsena42 · jvsena42 · commit 9b09fa0b7155 · 2025-03-19T11:08:24.000-03:00
diff --git a/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
@@ -96,6 +96,14 @@ class AppViewModel @Inject constructor(
         }
     }
 
+    fun addTagToSelected(newTag: String) {
+        _sendUiState.update {
+            it.copy(
+                selectedTags = it.selectedTags + newTag
+            )
+        }
+    }
+
     private var scan: Scanner? = null
 
     init {
@@ -641,6 +649,7 @@ data class SendUiState(
     val description: String = "",
     val isUnified: Boolean = false,
     val payMethod: SendMethod = SendMethod.ONCHAIN,
+    val selectedTags: List<String> = listOf(), //TODO save tags in other PR
     val decodedInvoice: LightningInvoice? = null,
 )
 

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,14 @@ class AppViewModel @Inject constructor(`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ fun addTagToSelected(newTag: String) {`
	`100`	`+ _sendUiState.update {`
	`101`	`+ it.copy(`
	`102`	`+ selectedTags = it.selectedTags + newTag`
	`103`	`+ )`
	`104`	`+ }`
	`105`	`+ }`
	`106`	`+`
`99`	`107`	`private var scan: Scanner? = null`
`100`	`108`
`101`	`109`	`init {`
`@@ -641,6 +649,7 @@ data class SendUiState(`
`641`	`649`	`val description: String = "",`
`642`	`650`	`val isUnified: Boolean = false,`
`643`	`651`	`val payMethod: SendMethod = SendMethod.ONCHAIN,`
	`652`	`+ val selectedTags: List<String> = listOf(), //TODO save tags in other PR`
`644`	`653`	`val decodedInvoice: LightningInvoice? = null,`
`645`	`654`	`)`
`646`	`655`