mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-21 14:34:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into renovate/react-native-keychain-9.x

Browse source
This commit is contained in:
Marcos Rodriguez Vélez 2024-11-15 20:09:07 -04:00 • committed by GitHub
commit 434b7d7660
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
screen/wallets/ImportSpeed.tsx
View file

@ -13,7 +13,7 @@ import { AddWalletStackParamList } from '../../navigation/AddWalletStack';
type NavigationProp = NativeStackNavigationProp<AddWalletStackParamList, 'ImportSpeed'>; type NavigationProp = NativeStackNavigationProp<AddWalletStackParamList, 'ImportSpeed'>;
const WalletsImportWallet = () => { const ImportSpeed = () => {
const navigation = useNavigation<NavigationProp>(); const navigation = useNavigation<NavigationProp>();
const { colors } = useTheme(); const { colors } = useTheme();
const [loading, setLoading] = useState<boolean>(false); const [loading, setLoading] = useState<boolean>(false);
@ -102,4 +102,4 @@ const WalletsImportWallet = () => {
); );
}; };
export default WalletsImportWallet; export default ImportSpeed;

2
screen/wallets/ImportWalletDiscovery.tsx
View file

@ -197,7 +197,7 @@ const ImportWalletDiscovery: React.FC = () => {
) : ( ) : (
<> <>
<BlueText style={styles.center}>{loc.wallets.import_discovery_no_wallets}</BlueText> <BlueText style={styles.center}>{loc.wallets.import_discovery_no_wallets}</BlueText>
<BlueSpacing20 />{' '} <BlueSpacing20 />
</> </>
)} )}
</View> </View>

9
tests/e2e/bluewallet.spec.js
View file

@ -698,13 +698,14 @@ describe('BlueWallet UI Tests - no wallets', () => {
await element(by.id('DoImport')).tap(); await element(by.id('DoImport')).tap();
await sleep(1000); await sleep(1000);
await element(by.text('OK')).tap(); await element(by.text('OK')).tap();
await waitFor(element(by.id('Loading'))) // wait for discovery to be completed
.not.toExist()
.withTimeout(300 * 1000);
// wait for discovery to be completed
await waitFor(element(by.text("m/84'/0'/0'")))
.toBeVisible()
.withTimeout(300 * 1000);
await expect(element(by.text("m/44'/0'/1'"))).toBeVisible(); await expect(element(by.text("m/44'/0'/1'"))).toBeVisible();
await expect(element(by.text("m/49'/0'/0'"))).toBeVisible(); await expect(element(by.text("m/49'/0'/0'"))).toBeVisible();
await expect(element(by.text("m/84'/0'/0'"))).toBeVisible(); await expect(element(by.id('Loading'))).not.toBeVisible();
// open custom derivation path screen and import the wallet // open custom derivation path screen and import the wallet
await element(by.id('CustomDerivationPathButton')).tap(); await element(by.id('CustomDerivationPathButton')).tap();