Skip to content

Commit 4dc0bf4

Browse files
authored
Merge branch 'master' into chore/bump-verion
2 parents 2931fe8 + eee3800 commit 4dc0bf4

2 files changed

Lines changed: 17 additions & 8 deletions

File tree

.github/workflows/e2e_migration.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
description: "Branch of synonymdev/bitkit-e2e-tests to use (main | default-feature-branch | custom branch name)"
88
required: false
99
default: "default-feature-branch"
10+
schedule:
11+
- cron: "0 2 * * *"
1012

1113
env:
1214
TERM: xterm-256color
@@ -75,13 +77,17 @@ jobs:
7577
strategy:
7678
fail-fast: false
7779
matrix:
80+
rn_version:
81+
- v1.1.6
82+
- v1.1.4
83+
- v1.1.3
7884
scenario:
79-
- { name: migration_1, grep: "@migration_1" }
80-
- { name: migration_2, grep: "@migration_2" }
81-
- { name: migration_3, grep: "@migration_3" }
82-
- { name: migration_4, grep: "@migration_4" }
85+
- { name: migration_1-restore, grep: "@migration_1" }
86+
- { name: migration_2-migration, grep: "@migration_2" }
87+
- { name: migration_3-with-passphrase, grep: "@migration_3" }
88+
- { name: migration_4-with-sweep, grep: "@migration_4" }
8389

84-
name: e2e-tests - ${{ matrix.scenario.name }}
90+
name: e2e-tests - ${{ matrix.rn_version }} - ${{ matrix.scenario.name }}
8591

8692
steps:
8793
- name: Show selected E2E branch
@@ -111,7 +117,7 @@ jobs:
111117
- name: Download RN app for migration
112118
run: |
113119
curl -L -o bitkit-e2e-tests/aut/bitkit_rn_regtest.apk \
114-
https://github.com/synonymdev/bitkit-e2e-tests/releases/download/migration-rn-regtest/bitkit_rn_regtest.apk
120+
https://github.com/synonymdev/bitkit-e2e-tests/releases/download/migration-rn-regtest/bitkit_rn_regtest_${{ matrix.rn_version }}.apk
115121
116122
- name: List APK directory contents
117123
run: ls -l bitkit-e2e-tests/aut
@@ -189,5 +195,5 @@ jobs:
189195
if: failure()
190196
uses: actions/upload-artifact@v4
191197
with:
192-
name: e2e-artifacts_${{ matrix.scenario.name }}_${{ github.run_number }}
198+
name: e2e-artifacts_${{ matrix.scenario.name }}_${{ matrix.rn_version }}_${{ github.run_number }}
193199
path: bitkit-e2e-tests/artifacts/

app/src/main/java/to/bitkit/ui/settings/advanced/sweep/SweepSettingsScreen.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import androidx.compose.runtime.getValue
2020
import androidx.compose.ui.Alignment
2121
import androidx.compose.ui.Modifier
2222
import androidx.compose.ui.layout.ContentScale
23+
import androidx.compose.ui.platform.testTag
2324
import androidx.compose.ui.res.painterResource
2425
import androidx.compose.ui.res.stringResource
2526
import androidx.compose.ui.tooling.preview.Preview
@@ -224,7 +225,9 @@ private fun FoundFundsView(
224225
PrimaryButton(
225226
text = stringResource(R.string.sweep__to_wallet),
226227
onClick = onSweepToWallet,
227-
modifier = Modifier.fillMaxWidth()
228+
modifier = Modifier
229+
.fillMaxWidth()
230+
.testTag("SweepToWalletButton")
228231
)
229232

230233
VerticalSpacer(16.dp)

0 commit comments

Comments
 (0)