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

Merge pull request #5978 from BlueWallet/macf

Browse source 
FIX: macOS app UI fixes
This commit is contained in:
GLaDOS 2024-01-04 21:26:22 +00:00 • committed by GitHub
commit fecefc4a25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Navigation.js
View file

@ -322,7 +322,7 @@ const AztecoRedeemRoot = () => {
const ScanQRCodeStack = createNativeStackNavigator(); const ScanQRCodeStack = createNativeStackNavigator();
const ScanQRCodeRoot = () => ( const ScanQRCodeRoot = () => (
<ScanQRCodeStack.Navigator screenOptions={{ headerShown: false, presentation: isDesktop ? 'containedModal' : 'fullScreenModal' }}> <ScanQRCodeStack.Navigator screenOptions={{ headerShown: false, presentation: 'fullScreenModal' }}>
<ScanQRCodeStack.Screen name="ScanQRCode" component={ScanQRCode} /> <ScanQRCodeStack.Screen name="ScanQRCode" component={ScanQRCode} />
</ScanQRCodeStack.Navigator> </ScanQRCodeStack.Navigator>
); );
@ -450,7 +450,7 @@ const InitRoot = () => (
<InitStack.Screen <InitStack.Screen
name="ReorderWallets" name="ReorderWallets"
component={ReorderWalletsStackRoot} component={ReorderWalletsStackRoot}
options={{ headerShown: false, gestureEnabled: false, presentation: isDesktop ? 'containedModal' : 'modal' }} options={{ headerShown: false, gestureEnabled: false, presentation: 'modal' }}
/> />
<InitStack.Screen <InitStack.Screen
name={isHandset ? 'Navigation' : 'DrawerRoot'} name={isHandset ? 'Navigation' : 'DrawerRoot'}
@ -513,8 +513,8 @@ const PaymentCodeStackRoot = () => {
}; };
const RootStack = createNativeStackNavigator(); const RootStack = createNativeStackNavigator();
const NavigationDefaultOptions = { headerShown: false, presentation: isDesktop ? 'containedModal' : 'modal' }; const NavigationDefaultOptions = { headerShown: false, presentation: 'modal' };
const NavigationFormModalOptions = { headerShown: false, presentation: isDesktop ? 'containedModal' : 'formSheet' }; const NavigationFormModalOptions = { headerShown: false, presentation: 'formSheet' };
const StatusBarLightOptions = { statusBarStyle: 'light' }; const StatusBarLightOptions = { statusBarStyle: 'light' };
const Navigation = () => { const Navigation = () => {
return ( return (
@ -562,7 +562,7 @@ const Navigation = () => {
component={ScanQRCodeRoot} component={ScanQRCodeRoot}
options={{ options={{
headerShown: false, headerShown: false,
presentation: isDesktop ? 'containedModal' : 'fullScreenModal', presentation: 'fullScreenModal',
statusBarHidden: true, statusBarHidden: true,
}} }}
initialParams={ScanQRCode.initialParams} initialParams={ScanQRCode.initialParams}

9
screen/wallets/transactions.js
View file

@ -275,15 +275,6 @@ const WalletTransactions = ({ navigation }) => {
)} )}
<View style={styles.listHeaderTextRow}> <View style={styles.listHeaderTextRow}>
<Text style={[styles.listHeaderText, stylesHook.listHeaderText]}>{loc.transactions.list_title}</Text> <Text style={[styles.listHeaderText, stylesHook.listHeaderText]}>{loc.transactions.list_title}</Text>
<TouchableOpacity
accessibilityRole="button"
testID="refreshTransactions"
style={style}
onPress={refreshTransactions}
disabled={isLoading}
>
<Icon name="refresh" type="font-awesome" color={colors.feeText} />
</TouchableOpacity>
</View> </View>
</View> </View>
); );

2
tests/e2e/bluewallet2.spec.js
View file

@ -457,8 +457,6 @@ describe('BlueWallet UI Tests - import BIP84 wallet', () => {
// go inside the wallet // go inside the wallet
await element(by.text('Imported HD SegWit (BIP84 Bech32 Native)')).tap(); await element(by.text('Imported HD SegWit (BIP84 Bech32 Native)')).tap();
// refresh transactions
await element(by.id('refreshTransactions')).tap();
await waitFor(element(by.id('NoTxBuyBitcoin'))) await waitFor(element(by.id('NoTxBuyBitcoin')))
.not.toExist() .not.toExist()
.withTimeout(300 * 1000); .withTimeout(300 * 1000);