Merge pull request #2334 from BlueWallet/keysedit

REF: Manage keys spacing
This commit is contained in:
GLaDOS 2020-12-12 18:34:09 +00:00 committed by GitHub
commit 6d87fc8e5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 14 deletions

View File

@ -346,6 +346,36 @@ const InitRoot = () => (
</InitStack.Navigator>
);
const ViewEditMultisigCosignersStack = createStackNavigator();
const ViewEditMultisigCosignersRoot = () => (
<ViewEditMultisigCosignersStack.Navigator
name="ViewEditMultisigCosignersRoot"
screenOptions={defaultStackScreenOptions}
initialRouteName="ViewEditMultisigCosigners"
>
<ViewEditMultisigCosignersStack.Screen
name="ViewEditMultisigCosigners"
component={ViewEditMultisigCosigners}
options={ViewEditMultisigCosigners.navigationOptions}
/>
</ViewEditMultisigCosignersStack.Navigator>
);
const ExportMultisigCoordinationSetupStack = createStackNavigator();
const ExportMultisigCoordinationSetupRoot = () => (
<ExportMultisigCoordinationSetupStack.Navigator
name="ExportMultisigCoordinationSetupRoot"
screenOptions={defaultStackScreenOptions}
initialRouteName="ExportMultisigCoordinationSetup"
>
<ExportMultisigCoordinationSetupStack.Screen
name="ExportMultisigCoordinationSetup"
component={ExportMultisigCoordinationSetup}
options={ExportMultisigCoordinationSetup.navigationOptions}
/>
</ExportMultisigCoordinationSetupStack.Navigator>
);
const RootStack = createStackNavigator();
const Navigation = () => (
<RootStack.Navigator mode="modal" screenOptions={defaultScreenOptions} initialRouteName="LoadingScreenRoot">
@ -363,15 +393,11 @@ const Navigation = () => (
{/* screens */}
<RootStack.Screen name="WalletExportRoot" component={WalletExportStackRoot} options={{ headerShown: false }} />
<RootStack.Screen
name="ExportMultisigCoordinationSetup"
component={ExportMultisigCoordinationSetup}
options={ExportMultisigCoordinationSetup.navigationOptions}
/>
<RootStack.Screen
name="ViewEditMultisigCosigners"
component={ViewEditMultisigCosigners}
options={ViewEditMultisigCosigners.navigationOptions}
name="ExportMultisigCoordinationSetupRoot"
component={ExportMultisigCoordinationSetupRoot}
options={{ headerShown: false }}
/>
<RootStack.Screen name="ViewEditMultisigCosignersRoot" component={ViewEditMultisigCosignersRoot} options={{ headerShown: false }} />
<RootStack.Screen name="WalletXpubRoot" component={WalletXpubStackRoot} options={{ headerShown: false }} />
<RootStack.Screen name="BuyBitcoin" component={BuyBitcoin} options={BuyBitcoin.navigationOptions} />
<RootStack.Screen name="Marketplace" component={Marketplace} options={Marketplace.navigationOptions} />

View File

@ -193,13 +193,19 @@ const WalletDetails = () => {
});
};
const navigateToMultisigCoordinationSetup = () => {
navigate('ExportMultisigCoordinationSetup', {
walletId: wallet.getID(),
navigate('ExportMultisigCoordinationSetupRoot', {
screen: 'ExportMultisigCoordinationSetup',
params: {
walletId: wallet.getID(),
},
});
};
const navigateToViewEditCosigners = () => {
navigate('ViewEditMultisigCosigners', {
walletId: wallet.getID(),
navigate('ViewEditMultisigCosignersRoot', {
screen: 'ViewEditMultisigCosigners',
params: {
walletId: wallet.getID(),
},
});
};
const navigateToXPub = () =>

View File

@ -570,8 +570,11 @@ const WalletTransactions = () => {
};
const navigateToViewEditCosigners = () => {
navigate('ViewEditMultisigCosigners', {
walletId: wallet.current.getID(),
navigate('ViewEditMultisigCosignersRoot', {
screen: 'ViewEditMultisigCosigners',
params: {
walletId: wallet.current.getID(),
},
});
};