Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DDW-131] Connecting a hardware wallet #2016

Merged
merged 33 commits into from
May 26, 2020
Merged

[DDW-131] Connecting a hardware wallet #2016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6057418
[DDW-131] - Connecting a hardware wallet
DeeJayElly May 19, 2020
6770c53
[DDW-131] - Connecting a hardware wallet - fixing lint/flow issues
DeeJayElly May 19, 2020
ea2fbf0
[DDW-131] - Connecting a hardware wallet - adding translations + scss…
DeeJayElly May 20, 2020
6d86016
[DDW-131] - Connecting a hardware wallet
DeeJayElly May 20, 2020
b1fcba9
[DDW-131] - Connecting a hardware wallet
DeeJayElly May 20, 2020
b27b73f
[DDW-131] - Connecting a hardware wallet
DeeJayElly May 20, 2020
af67e65
[DDW-131] - Connecting a hardware wallet
DeeJayElly May 20, 2020
e22e50a
[DDW-131] - Connecting a hardware wallet
DeeJayElly May 20, 2020
70ba9a0
[DDW-131] - Connecting a hardware wallet - adding storybook items
DeeJayElly May 21, 2020
9eb9cac
Merge branch 'develop' into feature/ddw-131-connecting-a-hardware-wallet
DeeJayElly May 21, 2020
8e60206
[DDW-131] - Connecting a hardware wallet - adding storybook items
DeeJayElly May 21, 2020
62dd6f3
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 21, 2020
3b7682b
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 21, 2020
513f7f9
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 21, 2020
87e7bf8
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 21, 2020
1fd2ed4
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 21, 2020
cb658ca
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 23, 2020
8b23d3d
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 24, 2020
43d0cc7
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 24, 2020
ac958a1
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 24, 2020
5292c7f
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 24, 2020
4f92d0e
[DDW-131] - Connecting a hardware wallet - fixing issues
DeeJayElly May 25, 2020
1538188
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 25, 2020
171e606
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 25, 2020
2d705b7
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 25, 2020
4eddf9c
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 25, 2020
d706b9d
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 26, 2020
502754f
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 26, 2020
84917c1
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 26, 2020
6850fe9
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 26, 2020
2d45eef
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 26, 2020
440b035
[DDW-131] - Connecting a hardware wallet - flow issues
DeeJayElly May 26, 2020
47cd1bc
Merge branch 'develop' into feature/ddw-131-connecting-a-hardware-wallet
nikolaglumac May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions source/renderer/app/components/sidebar/Sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ type Props = {

export type SidebarMenus = {
wallets: ?{
items: Array<SidebarWalletType>,
activeWalletId: ?string,
actions: {
items?: Array<SidebarWalletType>,
nikolaglumac marked this conversation as resolved.
Show resolved Hide resolved
activeWalletId?: ?string,
actions?: {
onWalletItemClick: Function,
},
},
hardwareWallets: ?{
items: Array<SidebarHardwareWalletType>,
activeWalletId: ?string,
actions: {
items?: Array<SidebarHardwareWalletType>,
activeWalletId?: ?string,
actions?: {
nikolaglumac marked this conversation as resolved.
Show resolved Hide resolved
onHardwareWalletItemClick: Function,
},
},
Expand Down Expand Up @@ -87,7 +87,9 @@ export default class Sidebar extends Component<Props> {
wallets={menus.wallets ? menus.wallets.items : []}
onAddWallet={onAddWallet}
onWalletItemClick={
menus.wallets ? menus.wallets.actions.onWalletItemClick : null
menus.wallets && menus.wallets.actions
? menus.wallets.actions.onWalletItemClick
: null
}
isActiveWallet={id =>
id === (menus.wallets ? menus.wallets.activeWalletId : null)
Expand All @@ -111,7 +113,7 @@ export default class Sidebar extends Component<Props> {
wallets={menus.hardwareWallets ? menus.hardwareWallets.items : []}
onAddWallet={onAddWallet}
onWalletItemClick={
menus.hardwareWallets
menus.hardwareWallets && menus.hardwareWallets.actions
? menus.hardwareWallets.actions.onHardwareWalletItemClick
: null
}
Expand Down
2 changes: 1 addition & 1 deletion storybook/stories/navigation/Sidebar.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const sidebarMenus = observable({
},
},
},
hardwareWallets: null
hardwareWallets: null,
});

const sidebarMenusHardware = observable({
Expand Down