Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.

Set password mobile #764

Merged
merged 17 commits into from
Nov 2, 2018
Merged

Set password mobile #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1039b95
Upgrade expo to 30.0.2
tanx Oct 31, 2018
a901b6a
Install expo-cli locally not globally
tanx Oct 31, 2018
9768691
Add SF-Pro-Display & SF-Pro-Text fonts
tanx Oct 31, 2018
1980d15
Add backspace icon
tanx Oct 31, 2018
f1deae9
Implement pin input in wallet actions
tanx Oct 31, 2018
29ee28c
Implement PIN Entry components for mobile
tanx Oct 31, 2018
5df0620
Implement SetPassword view from mobile
tanx Oct 31, 2018
19a4096
Wire up SetupStack in mobile/main.js
tanx Oct 31, 2018
f2e0060
Move backspace button to the right
tanx Oct 31, 2018
e06a369
Fix storybook titles
tanx Oct 31, 2018
b7e31f2
Fix linking error in SetPassword view
tanx Oct 31, 2018
e5ce7e7
Stretch PinKeyboard on mobile
tanx Oct 31, 2018
9a18b85
Fix SetPassword mobile padding and typos
tanx Nov 1, 2018
9fa8f45
Implement password confirm navigation in wallet actions
tanx Nov 1, 2018
dec4bb3
Implement SetPasswordConfirm mobile screen
tanx Nov 1, 2018
b043949
Wire up screens in storybook/main.js
tanx Nov 1, 2018
8709755
Enable mobile nav to home after pin setup.
valentinewallace Nov 1, 2018
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
5 changes: 5 additions & 0 deletions mobile/component/font-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ class FontLoader extends React.Component {
'Poppins Bold': require('../../src/asset/font/Poppins-Bold.ttf'),
'Poppins ExtraBold': require('../../src/asset/font/Poppins-ExtraBold.ttf'),
'Poppins Black': require('../../src/asset/font/Poppins-Black.ttf'),
'SF Pro Display Regular': require('../../src/asset/font/SF-Pro-Display-Regular.ttf'),
'SF Pro Text Regular': require('../../src/asset/font/SF-Pro-Text-Regular.ttf'),
'SF Pro Text Medium': require('../../src/asset/font/SF-Pro-Text-Medium.ttf'),
'SF Pro Text SemiBold': require('../../src/asset/font/SF-Pro-Text-SemiBold.ttf'),
'SF Pro Text Bold': require('../../src/asset/font/SF-Pro-Text-Bold.ttf'),
'WorkSans Thin': require('../../src/asset/font/WorkSans-Thin.ttf'),
'WorkSans ExtraLight': require('../../src/asset/font/WorkSans-ExtraLight.ttf'),
'WorkSans Light': require('../../src/asset/font/WorkSans-Light.ttf'),
Expand Down
112 changes: 76 additions & 36 deletions mobile/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@ import { Clipboard } from 'react-native';
import { createStackNavigator } from 'react-navigation';
import FontLoader from './component/font-loader';

import Home from '../src/view/home';
import Setting from '../src/view/setting';
import SettingUnit from '../src/view/setting-unit';
import SettingFiat from '../src/view/setting-fiat';
import CLI from '../src/view/cli';
import Payment from '../src/view/payment';
import Invoice from '../src/view/invoice';
import InvoiceQR from '../src/view/invoice-qr';
import Deposit from '../src/view/deposit';
import SetPasswordView from '../src/view/set-password-mobile';
import SetPasswordConfirmView from '../src/view/set-password-confirm-mobile';
import SeedSuccessView from '../src/view/seed-success';
import NewAddressView from '../src/view/new-address';

import HomeView from '../src/view/home';
import SettingView from '../src/view/setting';
import SettingUnitView from '../src/view/setting-unit';
import SettingFiatView from '../src/view/setting-fiat';
import CLIView from '../src/view/cli';
import PaymentView from '../src/view/payment';
import InvoiceView from '../src/view/invoice';
import InvoiceQRView from '../src/view/invoice-qr';
import DepositView from '../src/view/deposit';

import sinon from 'sinon';
import { Store } from '../src/store';
Expand Down Expand Up @@ -40,7 +45,6 @@ const wallet = new WalletAction(store, grpc, db, nav, notify);
const setting = new SettingAction(store, wallet, db, ipc);
sinon.stub(wallet, 'update');
sinon.stub(wallet, 'checkSeed');
sinon.stub(wallet, 'checkNewPassword');
sinon.stub(wallet, 'checkPassword');
sinon.stub(wallet, 'getExchangeRate');
const transaction = new TransactionAction(store, grpc, nav, notify);
Expand All @@ -56,8 +60,26 @@ sinon.stub(channel, 'update');
sinon.stub(channel, 'connectAndOpen');
sinon.stub(channel, 'closeSelectedChannel');

const HomeScreen = () => (
<Home
const SetPassword = () => (
<SetPasswordView store={store} wallet={wallet} nav={nav} />
);

const SetPasswordConfirm = () => (
<SetPasswordConfirmView store={store} wallet={wallet} nav={nav} />
);

const SeedSuccess = () => <SeedSuccessView wallet={wallet} />;

const NewAddress = () => (
<NewAddressView
store={store}
invoice={invoice}
info={{ initLoaderSyncing: () => nav.goHome() }}
/>
);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@valentinewallace noice! 🙏

const Home = () => (
<HomeView
store={store}
wallet={wallet}
channel={channel}
Expand All @@ -68,39 +90,47 @@ const HomeScreen = () => (
/>
);

const SettingScreen = () => <Setting store={store} nav={nav} wallet={wallet} />;
const Settings = () => <SettingView store={store} nav={nav} wallet={wallet} />;

const SettingUnitScreen = () => (
<SettingUnit store={store} nav={nav} setting={setting} />
const SettingsUnit = () => (
<SettingUnitView store={store} nav={nav} setting={setting} />
);

const SettingFiatScreen = () => (
<SettingFiat store={store} nav={nav} setting={setting} />
const SettingsFiat = () => (
<SettingFiatView store={store} nav={nav} setting={setting} />
);

const CLIScreen = () => <CLI store={store} nav={nav} />;
const CLI = () => <CLIView store={store} nav={nav} />;

const DepositScreen = () => (
<Deposit store={store} invoice={invoice} nav={nav} />
);
const Deposit = () => <DepositView store={store} invoice={invoice} nav={nav} />;

const InvoiceScreen = () => (
<Invoice store={store} invoice={invoice} nav={nav} />
);
const Invoice = () => <InvoiceView store={store} invoice={invoice} nav={nav} />;

const InvoiceQRScreen = () => (
<InvoiceQR store={store} invoice={invoice} nav={nav} />
const InvoiceQR = () => (
<InvoiceQRView store={store} invoice={invoice} nav={nav} />
);

const PayScreen = () => <Payment store={store} payment={payment} nav={nav} />;
const Pay = () => <PaymentView store={store} payment={payment} nav={nav} />;

const SetupStack = createStackNavigator(
{
SetPassword,
SetPasswordConfirm,
SeedSuccess,
NewAddress,
},
{
headerMode: 'none',
}
);

const MainStack = createStackNavigator(
{
Home: HomeScreen,
Settings: SettingScreen,
SettingsUnit: SettingUnitScreen,
SettingsFiat: SettingFiatScreen,
CLI: CLIScreen,
Home,
Settings,
SettingsUnit,
SettingsFiat,
CLI,
},
{
headerMode: 'none',
Expand All @@ -109,8 +139,17 @@ const MainStack = createStackNavigator(

const InvoiceStack = createStackNavigator(
{
Invoice: InvoiceScreen,
InvoiceQR: InvoiceQRScreen,
Invoice,
InvoiceQR,
},
{
headerMode: 'none',
}
);

const PayStack = createStackNavigator(
{
Pay,
},
{
headerMode: 'none',
Expand All @@ -119,10 +158,11 @@ const InvoiceStack = createStackNavigator(

const RootStack = createStackNavigator(
{
Setup: SetupStack,
Main: MainStack,
Deposit: DepositScreen,
Pay: PayScreen,
Invoice: InvoiceStack,
Pay: PayStack,
Deposit,
},
{
mode: 'modal',
Expand Down
Loading