diff --git a/apps/wallet-mobile/.storybook/decorators/index.ts b/apps/wallet-mobile/.storybook/decorators/index.ts
index 572430fbca..69b8de868b 100644
--- a/apps/wallet-mobile/.storybook/decorators/index.ts
+++ b/apps/wallet-mobile/.storybook/decorators/index.ts
@@ -1,3 +1,4 @@
+export {ThemeProvider} from '@yoroi/theme'
export * from './modals'
export * from './navigation'
export * from './query'
diff --git a/apps/wallet-mobile/src/components/Button/Button.stories.tsx b/apps/wallet-mobile/src/components/Button/Button.stories.tsx
index 28d197d8bf..43c1c62fe3 100644
--- a/apps/wallet-mobile/src/components/Button/Button.stories.tsx
+++ b/apps/wallet-mobile/src/components/Button/Button.stories.tsx
@@ -1,5 +1,6 @@
import {action} from '@storybook/addon-actions'
import {storiesOf} from '@storybook/react-native'
+import {useTheme} from '@yoroi/theme'
import React from 'react'
import {ScrollView, StyleSheet, View, ViewProps} from 'react-native'
@@ -7,57 +8,85 @@ import icon from '../../assets/img/icon/dashboard.png'
import {Icon} from '../Icon'
import {Button} from './Button'
-storiesOf('Button', module).add('default', () => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- }
- onPress={() => action('onPress')()}
- title="Submit, with start content"
- />
-
-
-
- }
- onPress={() => action('onPress')()}
- title="Submit, with end content"
- />
-
-
-))
+storiesOf('Button', module).add('default', () => {
+ const {color, isDark, selectThemeName} = useTheme()
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ onPress={() => action('onPress')()}
+ title="Submit, with start content"
+ />
+
+
+
+ }
+ onPress={() => action('onPress')()}
+ title="Submit, with end content"
+ />
+
+
+ )
+})
const Row = (props: ViewProps) =>
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx
index e1153d68bc..1a8e5d5505 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx
@@ -30,7 +30,7 @@ const LedgerTransportSwitchView = ({onSelectUSB, onSelectBLE}: Props) => {
{strings.bluetoothExplanation}