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.

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

Add new payment container. #19

Merged
merged 3 commits into from Jul 23, 2018
Merged

Add new payment container. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a9a1e9
Render payment form in new payment screen.
abuiles Jul 23, 2018
73dc938
Add payment mutation.
abuiles Jul 23, 2018
f81bfb2
Use payment mutation in new payment container.
abuiles Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
130 changes: 60 additions & 70 deletions app/containers/NewPayment.tsx
View file
Open in desktop
Expand Up @@ -2,86 +2,79 @@ import * as React from 'react'
import { View } from 'react-native'

import { NavigationScreenProps } from 'react-navigation'
import { Body, Button, Container, Content, Header, Icon, Left, Right, Text, Title } from 'native-base'
import { Body, Button, Container, Content, Header, Icon, Left, Right, Title } from 'native-base'
import { styles as s } from 'react-native-style-tachyons'
import layoutStyles from '../styles/layout'
import DismissableStackNavigator from './DismissableStackNavigator'
import PaymentForm from '../components/PaymentForm'
import CurrentUserQuery, { GET_CURRENT_USER_QUERY } from '../queries/CurrentUser'
import PaymentMutation, { PAYMENT_MUTATION } from '../mutations/Payment'
import { Transaction } from '../Types'

export class RecipientScreen extends React.Component<NavigationScreenProps> {
async payment(mutation, sender: string, recipient: string, amount: string): Promise<Transaction> {
const { data } = await mutation({
variables: {
sender,
recipient,
amount
}
})

export class PaymentDetailsScreen extends React.Component<NavigationScreenProps> {
render() {
return (
<Container style={{ flex: 1, backgroundColor: '#F5FCFF' }}>
<Header style={layoutStyles.header}>
<Left>
<Button
transparent
onPress={() => this.props.screenProps.dismiss()}>
<Icon name='close' />
</Button>
</Left>
<Body>
<Title>New payment</Title>
</Body>
<Right />
</Header>
<Content scrollEnabled={false}>
<View
style={[
s.jcc,
s.aic,
s.pa4
]}
>
<Text style={[s.pa4]}>Payment details screen</Text>
</View>
</Content>
</Container>
)
return data.payment
}

didSend(): void {
this.props.navigation.navigate('Home')
}
}

export class RecipientScreen extends React.Component<NavigationScreenProps> {
render() {
const { navigation } = this.props

const userSelected = () => navigation.navigate('PaymentDetails')

return (
<Container style={{backgroundColor: '#F5FCFF'}}>
<Header style={layoutStyles.header}>
<Left>
<Button
transparent
onPress={() => this.props.screenProps.dismiss()}>
<Icon name='close' />
</Button>
</Left>
<Body>
<Title>Recipient</Title>
</Body>
<Right>
<Button
transparent>
<Icon name='ios-qr-scanner' />
</Button>
</Right>
</Header>
<Content scrollEnabled={false}>
<View
style={[
s.jcc,
s.aic,
s.pa4
]}
>
<Text style={[s.pa4]}>Select recipient screen</Text>
<Button style={[s.pa4]} onPress={() => userSelected() }>
<Text>Go to payment details screen</Text>
</Button>
</View>
</Content>
</Container>
<CurrentUserQuery query={GET_CURRENT_USER_QUERY}>
{({ loading, data }) => {
if (loading) {
return <Loading />
}

const { me } = data

return (
<Container style={{backgroundColor: '#F5FCFF'}}>
<Header style={layoutStyles.header}>
<Left>
<Button
transparent
onPress={() => this.props.screenProps.dismiss()}>
<Icon name='close' />
</Button>
</Left>
<Body>
<Title>New payment</Title>
</Body>
<Right>
<Button
transparent>
<Icon name='ios-qr-scanner' />
</Button>
</Right>
</Header>
<Content scrollEnabled={false}>
<PaymentMutation mutation={PAYMENT_MUTATION}>
{(mutation, { data }) => {
return (
<PaymentForm send={this.payment.bind(this, mutation, me.username)} didSend={this.didSend.bind(this)} />
)
}}
</PaymentMutation>
</Content>
</Container>
)
}}
</CurrentUserQuery>
)
}
}
Expand All @@ -90,9 +83,6 @@ export default DismissableStackNavigator(
{
Recipient: {
screen: RecipientScreen
},
PaymentDetails: {
screen: PaymentDetailsScreen
}
},
{
Expand Down
23 changes: 23 additions & 0 deletions app/mutations/Payment.tsx
View file
Open in desktop
@@ -0,0 +1,23 @@
import { Mutation } from 'react-apollo'
import gql from 'graphql-tag'
import { Transaction } from '../Types'

interface Data {
payment: Transaction
}

interface Variables {
amount: string
sender: string
recipient: string
}

export const PAYMENT_MUTATION = gql`
mutation payment($amount: String!, $sender: String!, $recipient: String!) {
payment(amount: $amount, senderUsername: $sender, recipientUsername: $recipient) {
id
}
}
`

export default class PaymentMutation extends Mutation<Data, Variables> {}