Skip to content

Commit da98a89

Browse files
committed
Merge branch 'fix/get-detail-by-tx-id' into fix/tag-syncing
2 parents 9e5b897 + 161ca8c commit da98a89

File tree

4 files changed

+28
-4
lines changed

4 files changed

+28
-4
lines changed

app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityAddTagSheet.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import androidx.compose.runtime.DisposableEffect
77
import androidx.compose.runtime.LaunchedEffect
88
import androidx.compose.runtime.getValue
99
import androidx.compose.ui.Modifier
10+
import androidx.compose.ui.semantics.semantics
11+
import androidx.compose.ui.semantics.testTagsAsResourceId
1012
import androidx.compose.ui.tooling.preview.Preview
1113
import androidx.hilt.navigation.compose.hiltViewModel
1214
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -65,6 +67,7 @@ fun ActivityAddTagSheet(
6567
tagInputTestTag = "TagInput",
6668
addButtonTestTag = "ActivityTagsSubmit",
6769
modifier = Modifier
70+
.semantics { testTagsAsResourceId = true }
6871
.sheetHeight(SheetSize.SMALL, isModal = true)
6972
.gradientBackground()
7073
)

app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAddressScreen.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.height
88
import androidx.compose.foundation.layout.navigationBarsPadding
99
import androidx.compose.foundation.layout.padding
10+
import androidx.compose.foundation.text.KeyboardOptions
1011
import androidx.compose.runtime.Composable
1112
import androidx.compose.runtime.LaunchedEffect
1213
import androidx.compose.runtime.remember
@@ -15,6 +16,8 @@ import androidx.compose.ui.focus.FocusRequester
1516
import androidx.compose.ui.focus.focusRequester
1617
import androidx.compose.ui.platform.testTag
1718
import androidx.compose.ui.res.stringResource
19+
import androidx.compose.ui.text.input.ImeAction
20+
import androidx.compose.ui.text.input.KeyboardCapitalization
1821
import androidx.compose.ui.tooling.preview.Preview
1922
import androidx.compose.ui.unit.dp
2023
import kotlinx.coroutines.delay
@@ -70,6 +73,11 @@ fun SendAddressScreen(
7073
value = uiState.addressInput,
7174
onValueChange = { onEvent(SendEvent.AddressChange(it)) },
7275
minLines = 12,
76+
keyboardOptions = KeyboardOptions(
77+
capitalization = KeyboardCapitalization.None,
78+
imeAction = ImeAction.Done,
79+
autoCorrectEnabled = false
80+
),
7381
textStyle = AppTextStyles.Title,
7482
modifier = Modifier
7583
.fillMaxWidth()

app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ import androidx.compose.ui.Modifier
3232
import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.res.painterResource
3434
import androidx.compose.ui.res.stringResource
35+
import androidx.compose.ui.semantics.semantics
36+
import androidx.compose.ui.semantics.testTagsAsResourceId
3537
import androidx.compose.ui.text.style.TextOverflow
3638
import androidx.compose.ui.tooling.preview.Devices
3739
import androidx.compose.ui.tooling.preview.Preview
@@ -247,7 +249,9 @@ private fun Content(
247249
onEvent(SendEvent.DismissAmountWarning)
248250
onBack()
249251
},
250-
modifier = Modifier.testTag(dialog.testTag),
252+
modifier = Modifier
253+
.semantics { testTagsAsResourceId = true }
254+
.testTag(dialog.testTag),
251255
)
252256
}
253257
}

app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import androidx.compose.ui.layout.ContentScale
2121
import androidx.compose.ui.platform.testTag
2222
import androidx.compose.ui.res.painterResource
2323
import androidx.compose.ui.res.stringResource
24+
import androidx.compose.ui.semantics.semantics
25+
import androidx.compose.ui.semantics.testTagsAsResourceId
2426
import androidx.compose.ui.tooling.preview.Preview
2527
import androidx.compose.ui.unit.dp
2628
import com.airbnb.lottie.compose.LottieAnimation
@@ -84,6 +86,7 @@ fun NewTransactionSheetView(
8486
) {
8587
Box(
8688
modifier = Modifier
89+
.semantics { testTagsAsResourceId = true }
8790
.sheetHeight(isModal = true)
8891
.gradientBackground()
8992
.testTag("new_transaction_sheet")
@@ -155,7 +158,13 @@ fun NewTransactionSheetView(
155158
onClick = { onDetailClick },
156159
modifier = Modifier
157160
.fillMaxWidth()
158-
.testTag("ReceivedTransaction")
161+
.testTag(
162+
if (details.direction == NewTransactionSheetDirection.SENT) {
163+
"SendSuccess"
164+
} else {
165+
"ReceivedTransaction"
166+
}
167+
)
159168
)
160169

161170
Spacer(modifier = Modifier.weight(1f))
@@ -174,14 +183,14 @@ fun NewTransactionSheetView(
174183
isLoading = details.isLoadingDetails,
175184
modifier = Modifier
176185
.weight(1f)
177-
.testTag("details_button")
186+
.testTag("Details")
178187
)
179188
PrimaryButton(
180189
text = stringResource(R.string.common__close),
181190
onClick = onCloseClick,
182191
modifier = Modifier
183192
.weight(1f)
184-
.testTag("close_button")
193+
.testTag("Close")
185194
)
186195
}
187196
} else {

0 commit comments

Comments
 (0)