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 #2971 from BlueWallet/nomodaladdress

Browse source 
REF:  Push transition on addresses view
This commit is contained in:
GLaDOS 2021-04-17 12:06:26 +01:00 • committed by GitHub
commit 90d623eec7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Navigation.js
View file

@ -177,6 +177,7 @@ const WalletsRoot = () => {
gestureEnabled: false,
}}
/>
<WalletsStack.Screen name="WalletAddresses" component={WalletAddresses} options={WalletAddresses.navigationOptions(theme)} />
</WalletsStack.Navigator>
);
};
@ -393,17 +394,6 @@ const SignVerifyStackRoot = () => {
);
};
const WalletAddressesStack = createStackNavigator();
const WalletAddressesStackRoot = () => {
const theme = useTheme();
return (
<WalletAddressesStack.Navigator name="WalletAddressesRoot" screenOptions={defaultStackScreenOptions} initialRouteName="WalletAddresses">
<WalletAddressesStack.Screen name="WalletAddresses" component={WalletAddresses} options={WalletAddresses.navigationOptions(theme)} />
</WalletAddressesStack.Navigator>
);
};
const WalletExportStack = createStackNavigator();
const WalletExportStackRoot = () => {
const theme = useTheme();
@ -504,7 +494,6 @@ const Navigation = () => {
<RootStack.Screen name="ViewEditMultisigCosignersRoot" component={ViewEditMultisigCosignersRoot} options={{ headerShown: false }} />
<RootStack.Screen name="WalletXpubRoot" component={WalletXpubStackRoot} options={{ headerShown: false }} />
<RootStack.Screen name="SignVerifyRoot" component={SignVerifyStackRoot} options={{ headerShown: false }} />
<RootStack.Screen name="WalletAddressesRoot" component={WalletAddressesStackRoot} options={{ headerShown: false }} />
<RootStack.Screen name="BuyBitcoin" component={BuyBitcoin} options={BuyBitcoin.navigationOptions(theme)} />
<RootStack.Screen name="Marketplace" component={Marketplace} options={Marketplace.navigationOptions(theme)} />
<RootStack.Screen name="SelectWallet" component={SelectWallet} options={{ headerLeft: null }} />

4
screen/wallets/addresses.js
View file

@ -68,9 +68,7 @@ const WalletAddresses = () => {
const { wallets } = useContext(BlueStorageContext);
const {
params: { walletID },
} = useRoute();
const { walletID } = useRoute().params;
const wallet = wallets.find(w => w.getID() === walletID);

7
screen/wallets/details.js
View file

@ -242,11 +242,8 @@ const WalletDetails = () => {
});
const navigateToAddresses = () =>
navigate('WalletAddressesRoot', {
screen: 'WalletAddresses',
params: {
walletID: wallet.getID(),
},
navigate('WalletAddresses', {
walletID: wallet.getID(),
});
const renderMarketplaceButton = () => {