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

Add balance check #19

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
},
"NFCScreen": {
"ErrorMessage": "لمس بطاقة",
"BalanceCheckMessage": "تحقق من الرصيد",
"NFCError": "خطأ NFC",
"NFCCounterError": "خطأ في تطبيق المعاملة على البطاقة",
"NFCErrorMessage": "لا يحتوي جهازك على قارئ NFC.",
Expand Down Expand Up @@ -222,7 +223,8 @@
"PaymentModeSwitcher": {
"SendHint": "انتقل إلى شاشة الإرسال",
"ChargeHint": "انتقل لاستلام الشاشة",
"ScanHint": "انتقل إلى شاشة مسح الكاميرا"
"ScanHint": "انتقل إلى شاشة مسح الكاميرا",
"BalanceHint": "انتقل للتحقق من رصيد البطاقة"
},
"SendPaymentCameraScreen": {
"Send": "إرسال",
Expand Down
4 changes: 3 additions & 1 deletion locales/bi.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
},
"NFCScreen": {
"ErrorMessage": "Tajem Kad Lo Phon",
"BalanceCheckMessage": "Check Balance",
"NFCError": "Problem",
"NFCCounterError": "Error Applying Transaction To Card",
"NFCErrorMessage": "Your device does not have an NFC reader.",
Expand Down Expand Up @@ -223,7 +224,8 @@
"PaymentModeSwitcher": {
"SendHint": "Navigate to send screen",
"ChargeHint": "Navigate to receive screen",
"ScanHint": "Navigate to camera scan screen"
"ScanHint": "Navigate to camera scan screen",
"BalanceHint": "Navigate to check card balance"
},
"SendPaymentCameraScreen": {
"Send": "Sendem",
Expand Down
4 changes: 3 additions & 1 deletion locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
},
"NFCScreen": {
"ErrorMessage": "Hold Card To Back",
"BalanceCheckMessage": "Check Balance",
"NFCError": "NFC Error",
"NFCCounterError": "Error Applying Transaction To Card",
"NFCErrorMessage": "Your device does not have an NFC reader.",
Expand Down Expand Up @@ -222,7 +223,8 @@
"PaymentModeSwitcher": {
"SendHint": "Navigate to send screen",
"ChargeHint": "Navigate to receive screen",
"ScanHint": "Navigate to camera scan screen"
"ScanHint": "Navigate to camera scan screen",
"BalanceHint": "Navigate to check card balance"
},
"SendPaymentCameraScreen": {
"Send": "Send",
Expand Down
4 changes: 3 additions & 1 deletion locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
},
"NFCScreen": {
"ErrorMessage": "Toque la tarjeta",
"BalanceCheckMessage": "Consultar saldo",
"NFCError": "Error de tarjeta",
"NFCCounterError": "Error al aplicar la transacción a la tarjeta",
"NFCErrorMessage": "Su dispositivo no tiene una lectora NFC.",
Expand Down Expand Up @@ -223,7 +224,8 @@
"PaymentModeSwitcher": {
"SendHint": "Navegar a la pantalla de envío",
"ChargeHint": "Navegar a la pantalla de recepción",
"ScanHint": "Navegar a la pantalla de escaneo de la cámara"
"ScanHint": "Navegar a la pantalla de escaneo de la cámara",
"BalanceHint": "Navegar para consultar el saldo de la tarjeta"
},
"SendPaymentCameraScreen": {
"Send": "Enviar",
Expand Down
4 changes: 3 additions & 1 deletion locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
},
"NFCScreen": {
"ErrorMessage": "Carte Tap",
"BalanceCheckMessage": "Vérifier le solde",
"NFCError": "Erreur NFC",
"NFCCounterError": "Erreur lors de l'application de la transaction à la carte",
"NFCErrorMessage": "Votre appareil ne possède pas de lecteur NFC.",
Expand Down Expand Up @@ -222,7 +223,8 @@
"PaymentModeSwitcher": {
"SendHint": "Accédez à l'écran d'envoi",
"ChargeHint": "Naviguez pour recevoir l'écran",
"ScanHint": "Accédez à l'écran de numérisation de la caméra"
"ScanHint": "Accédez à l'écran de numérisation de la caméra",
"BalanceHint": "Naviguez pour vérifier le solde de la carte"
},
"SendPaymentCameraScreen": {
"Send": "Envoyer",
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Sempo",
"version": "1.7.4",
"version": "1.7.5",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down
9 changes: 5 additions & 4 deletions src/api/nfcAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import NfcManager, {NfcTech} from 'react-native-nfc-manager';

import {threeByteArrayToInt, byteArrayToHexString, intToThreeByteArray, getDisplayDecimals} from "../utils";

export const OpenNFCRequest = async () => (
NfcManager.registerTagEvent()
.then(() => NfcManager.requestTechnology(NfcTech.NfcA))
);
export const OpenNFCRequest = async () => {
return NfcManager.registerTagEvent()
.then(() => NfcManager.requestTechnology(NfcTech.NfcA))

}

export const closeNFCRequest = async () => NfcManager.cancelTechnologyRequest();

Expand Down
10 changes: 3 additions & 7 deletions src/components/PaymentModeSwitcher.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
'use strict';
import React, { Component } from 'react';
import {
Dimensions,
StyleSheet,
Text,
View,
Alert,
TouchableNativeFeedback,
Vibration,
Clipboard,
Linking,
} from 'react-native';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';

Expand Down Expand Up @@ -41,6 +35,7 @@ class PaymentModeSwitcher extends Component {
static defaultProps = {
camera: false,
send: false,
balance: false,
charge: false,
dark: false,
};
Expand All @@ -49,13 +44,14 @@ class PaymentModeSwitcher extends Component {

let paymentOptions = [
{mode: 'camera', name: 'qrcode-scan', active: this.props.camera, transform: [], label: strings('SendPaymentCameraScreen.CameraPrompt'), hint: strings('PaymentModeSwitcher.ScanHint')},
{mode: 'balance', name: 'cellphone-nfc', active: this.props.balance, transform: [], label: strings('SendPaymentCameraScreen.CardBalance'), hint: strings('PaymentModeSwitcher.BalanceHint')},
{mode: 'send', name: 'send', active: this.props.send, transform: [{rotate: '-45deg'}], label: strings('SendPaymentCameraScreen.Send'), hint: strings('PaymentModeSwitcher.SendHint')},
];

if (this.props.login.isVendor || this.props.login.isSupervendor) {
paymentOptions.push({mode: 'charge', name: 'credit-card-multiple', active: this.props.charge, transform: [], label: strings('NavBar.chargeButtonText'), hint: strings('PaymentModeSwitcher.ChargeHint')})
}

return (
<View style={[styles.rootContainer, {borderColor: (this.props.dark ? '#000' : '#FFF')}]}>
{paymentOptions.map((option, index) => {
Expand Down
8 changes: 6 additions & 2 deletions src/components/PaymentSwitch.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
import { connect } from "react-redux";

import SendPaymentCameraScreen from './SendPaymentFlow/SendPaymentCameraScreen';
import CheckCardBalanceScreen from './SendPaymentFlow/CheckCardBalanceScreen';
import PaymentAmountScreen from "./SendPaymentFlow/PaymentAmountScreen.js"
import PaymentsAmountScreen from "../components/ReceivePaymentFlow/PaymentsAmountScreen";

Expand All @@ -30,19 +31,22 @@ class PaymentSwitch extends Component {
static defaultProps = {
camera: false,
send: false,
charge: false
charge: false,
balance: false
};

render() {
const { transferData } = this.props;
console.log('payment switch--',transferData.default_transfer_mode);
console.log('payment switch--', transferData.default_transfer_mode);

if (transferData.default_transfer_mode === 'camera' && transferData.temp_transfer_mode === null) {
return <SendPaymentCameraScreen navigation={this.props.navigation} />
} else if (transferData.default_transfer_mode === 'send' || transferData.temp_transfer_mode === 'send') {
return <PaymentAmountScreen navigation={this.props.navigation} />
} else if (transferData.default_transfer_mode === 'charge') {
return <PaymentsAmountScreen navigation={this.props.navigation} />
} else if (transferData.default_transfer_mode == 'balance') {
return <CheckCardBalanceScreen navigation={this.props.navigation} />
} else if (this.props.login.isVendor) {
return <PaymentsAmountScreen navigation={this.props.navigation} />
} else {
Expand Down
Loading