Stage

README.md

@@ -90,6 +90,6 @@ To deploy this software on production
 This repository uses eslint to enforce air-bnb coding styles.
 
 # Contributing
-Everyone is very welcome to contribute on the codebase of Rahat. Please reach us in [Gitter](https://gitter.im/bockies/community?utm_source=badge&utm_medium=badge&utm_content=badge) in case of any query/feedback/suggestion.
+Everyone is very welcome to contribute on the codebase of Rahat. Please reach us in [Discord](https://discord.gg/AV5j2T94VR) in case of any query/feedback/suggestion.
 
-For more information on the contributing procedure, see [Contribution](https://github.com/esatya/rahat-vendor/blob/master/CONTRIBUTING.md).
+For more information on the contributing procedure, see [Contribution](https://docs.rahat.io/docs/next/Contribution-Guidelines).

package.json

@@ -22,7 +22,7 @@
  "@testing-library/jest-dom": "^5.11.4",
  "@testing-library/react": "^11.1.0",
  "@testing-library/user-event": "^12.1.10",
- "axios": "^0.24.0",
+ "axios": "^0.25.0",
  "bootstrap": "^4.5.1",
  "crypto-js": "^4.0.0",
  "dexie": "^3.0.3",

src/actions/appActions.js

@@ -7,5 +7,6 @@ module.exports = {
  SET_SCANNED_DATA: 'set_scanned_eth_address',
  SET_APP_PASSCODE: 'set_app_passcode',
  SET_BALANCE: 'set_balance',
- ADD_RECENT_TX: 'add_recent_tx'
+ ADD_RECENT_TX: 'add_recent_tx',
+ SET_LOADING: 'set_loading'
 };

src/actionsheets/sheets/ChargeDetails.js

@@ -1,4 +1,3 @@
-
 import { useContext } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Form } from 'react-bootstrap';
@@ -9,6 +8,7 @@ import Swal from 'sweetalert2';
 // import { AppContext } from '../../contexts/AppContext';
 import { ActionSheetContext } from '../../contexts/ActionSheetContext';
 import ActionSheet from './ActionSheet';
+import { checkBeneficiary } from '../../services';
 
 export default function ChargeDetails(props) {
  const history = useHistory();
@@ -19,6 +19,12 @@ export default function ChargeDetails(props) {
 
  const chargeCustomer = async () => {
  showLoading('Charging customer account...');
+ const isBeneficiary = await checkBeneficiary(data.phone);
+ if (!isBeneficiary.data) {
+ setActiveSheet('null');
+ showLoading(null);
+ return Swal.fire('Error', `${isBeneficiary.message || 'Invalid Beneficiary'}`, 'error');
+ }
  try {
  // const agency = await DataService.getDefaultAgency();
  // const rahat = RahatService(agency.address, wallet);

src/assets/custom/styles.css

@@ -1,64 +1,67 @@
 .circleSelfie {
- border-radius: 50%!important;
- width : 250px;
- height: 250px;
- object-fit: cover;
- border: 5px solid #958d9e;
+ border-radius: 50% !important;
+ width: 250px;
+ height: 250px;
+ object-fit: cover;
+ border: 5px solid #958d9e;
 }
 
 .selfieWrapper {
- /* width: 100%; */
- height: auto;
+ /* width: 100%; */
+ height: auto;
+}
+.loading_text {
+ color: #e27a2a;
 }
 
 .idCardWrapper {
- width: 100%;
- height: 350px;
+ width: 100%;
+ height: 350px;
 }
 
 .idCardSnapper {
- border-radius: 10%;
- height: 350px;
- object-fit: cover;
- border: 3px solid #958d9e;
+ border-radius: 10%;
+ height: 350px;
+ object-fit: cover;
+ border: 3px solid #958d9e;
 }
 
 .button-link {
- background-color: transparent;
- border: none;
- cursor: pointer;
- text-decoration: none;
- display: inline;
- margin: 0;
- padding: 0;
+ background-color: transparent;
+ border: none;
+ cursor: pointer;
+ text-decoration: none;
+ display: inline;
+ margin: 0;
+ padding: 0;
 }
 
- .button-link:hover,
- .button-link:focus {
- text-decoration: none;
- }
+.button-link:hover,
+.button-link:focus {
+ text-decoration: none;
+}
 
- .btn-shutter{
- width: 80px;
- height: 80px;
- /* border: 2px solid #958d9e; */
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: 50%;
- background-color: #2b7ec1;
- }
- .btn-shutter-icon{
- width: 40px;
- height: 40px;
- color: white;
- }
- .btn-faceChange{
- width: 50px;
- height: 50px;
- border-radius: 50%;
- background-color: white;
- display: flex;
- justify-content: center;
- align-items: center;
- }
+.btn-shutter {
+ width: 80px;
+ height: 80px;
+ /* border: 2px solid #958d9e; */
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50%;
+ background-color: #2b7ec1;
+}
+.btn-shutter-icon {
+ width: 40px;
+ height: 40px;
+ color: white;
+}
+.btn-faceChange {
+ width: 50px;
+ height: 50px;
+ border-radius: 50%;
+ background-color: white;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}

src/constants/api.js

@@ -1,8 +1,11 @@
-const server_url = process.env.REACT_APP_DEFAULT_AGENCY_API;
-const base_url = server_url + '/api/v1';
-
-module.exports = {
- REGISTER: base_url + '/vendors/register',
- NFT: server_url + '/nft',
- SERVER_URL: server_url
-};
+const server_url = process.env.REACT_APP_DEFAULT_AGENCY_API;
+const base_url = server_url + '/api/v1';
+
+module.exports = {
+ REGISTER: base_url + '/vendors/register',
+ NFT: base_url + '/nft',
+ VENDORS: base_url + '/vendors',
+ SERVER_URL: server_url,
+ APP: base_url + '/app',
+ BASE_URL: base_url
+};

src/constants/index.js

@@ -1,15 +1,19 @@
 module.exports = {
  APP_CONSTANTS: {
  VERSION: 1,
- PASSCODE_LENGTH: 6,
+ PASSCODE_LENGTH: 10,
  SCAN_DELAY: 600,
  CHARGE_TYPES: {
  TOKEN: 'token',
  NFT: 'nft',
  TOKEN_RECIEVED: 'tokenRecieved',
  TOKEN_SENT: 'tokenSent',
  NFT_RECIEVED: 'nftRecieved',
- NFT_SENT: 'nftSent'
+ NFT_SENT: 'nftSent',
+ REDEEMED_TOKEN: 'tokenRedeemed',
+ REDEEMED_PACKAGE: 'packageRedeemed',
+ TOKEN_TRANSFER: 'tokenTransfer',
+ PAKCAGE_TRANSFER: 'packageTransfer'
  },
  DEFAULT_NFT_CHARGE: 1,
  SCANNER_PREVIEW_STYLE: {
@@ -21,7 +25,7 @@ module.exports = {
  },
  BACKUP: {
  PASSPHRASE_RULE: '"^(?=.*[a-zA-Z])(?=.*[0-9])(?=.{12,})"',
- GDRIVE_FOLDERNAME: 'RumsanWalletBackups'
+ GDRIVE_FOLDERNAME: 'VendorBackups'
  },
  DB: {
  NAME: 'db_wallet',

src/contexts/AppContext.js

@@ -1,54 +1,80 @@
-import React, { createContext, useState, useReducer, useCallback } from 'react';
+import React, { createContext, useReducer, useCallback } from 'react';
 import appReduce from '../reducers/appReducer';
 import APP_ACTIONS from '../actions/appActions';
 import DataService from '../services/db';
 import { TokenService } from '../services/chain';
 import { APP_CONSTANTS, DEFAULT_TOKEN } from '../constants';
+import { ethers } from 'ethers';
 
 const initialState = {
+ contextLoading: false,
  address: null,
  agency: null,
  network: null,
  wallet: null,
  profile: null,
- hasWallet: true,
+ hasWallet: false,
+ hasBackedUp: false,
  tokenBalance: 0,
  scannedEthAddress: '',
- scannedAmount: null
+ scannedAmount: null,
+ hasSynchronized: false,
+ recentTx: []
 };
 
 export const AppContext = createContext(initialState);
 export const AppContextProvider = ({ children }) => {
  const [state, dispatch] = useReducer(appReduce, initialState);
- const [recentTx, setRecentTx] = useState([]);
+ const toggleLoading = useCallback((loading = false) => {
+ dispatch({ type: APP_ACTIONS.SET_LOADING, data: loading });
+ }, []);
+ const initialize_index_db = useCallback(async () => {
+ DataService.dbInstance
+ .open()
+ .then(async () => {
+ console.log('Dexie succesfully opened');
+ await DataService.addDefaultAsset(DEFAULT_TOKEN.SYMBOL, DEFAULT_TOKEN.NAME);
+ await DataService.save('version', APP_CONSTANTS.VERSION);
+ })
+ .catch(err => {
+ console.log('Cannot open dexie', err);
+ });
+ }, []);
 
  const initApp = useCallback(async () => {
- DataService.addDefaultAsset(DEFAULT_TOKEN.SYMBOL, DEFAULT_TOKEN.NAME);
+ toggleLoading(true);
  //TODO: in future check version and add action if the version is different.
- DataService.save('version', APP_CONSTANTS.VERSION);
+ await initialize_index_db();
  let data = await DataService.initAppData();
  data.profile = await DataService.getProfile();
  data.hasWallet = data.wallet === null ? false : true;
  if (!data.hasWallet) {
  localStorage.removeItem('address');
  } else {
  let agency = await DataService.getDefaultAgency();
- if (!agency) return;
- const balance = await TokenService(agency.address).getBalance();
+ let balance;
+ try {
+ if (!agency) throw Error('No agency');
+ const blcs = await TokenService(agency.address).getBalance();
+ balance = blcs;
+ } catch (err) {
+ balance = ethers.BigNumber.from(0);
+ }
  data.balance = balance.toNumber();
  data.agency = agency;
  }
  dispatch({ type: APP_ACTIONS.INIT_APP, data });
- }, [dispatch]);
+ toggleLoading(false);
+ }, [toggleLoading, initialize_index_db]);
 
  async function setAgency(agency) {
  if (!agency) agency = await DataService.getDefaultAgency();
  dispatch({ type: APP_ACTIONS.SET_AGENCY, data: agency });
  }
 
- async function setTokenBalance(tokenBalance) {
+ const setTokenBalance = useCallback(tokenBalance => {
  dispatch({ type: APP_ACTIONS.SET_BALANCE, data: tokenBalance });
- }
+ }, []);
 
  function setHasWallet(hasWallet) {
  dispatch({ type: APP_ACTIONS.SET_HASWALLET, data: hasWallet });
@@ -66,12 +92,9 @@ export const AppContextProvider = ({ children }) => {
  dispatch({ type: APP_ACTIONS.SET_SCANNED_DATA, data });
  }
 
- function addRecentTx(tx) {
- setRecentTx([]);
- if (!Array.isArray(tx)) tx = [tx];
- const arr = [...tx, ...recentTx];
- setRecentTx(arr.slice(0, 3));
- }
+ const addRecentTx = useCallback(tx => {
+ dispatch({ type: APP_ACTIONS.ADD_RECENT_TX, data: tx });
+ }, []);
 
  return (
  <AppContext.Provider
@@ -82,9 +105,12 @@ export const AppContextProvider = ({ children }) => {
  scannedEthAddress: state.scannedEthAddress,
  scannedAmount: state.scannedAmount,
  hasWallet: state.hasWallet,
+ hasBackedUp: state.hasBackedUp,
+ contextLoading: state.contextLoading,
+ hasSynchronized: state.hasSynchronized,
  network: state.network,
  wallet: state.wallet,
- recentTx,
+ recentTx: state.recentTx,
  initApp,
  setAgency,
  setTokenBalance,
@@ -93,7 +119,8 @@ export const AppContextProvider = ({ children }) => {
  setNetwork,
  setWallet,
  dispatch,
- addRecentTx
+ addRecentTx,
+ toggleLoading
  }}
  >
  {children}

src/hooks/useSignature.js

@@ -0,0 +1,17 @@
+import { useState, useEffect, useCallback } from 'react';
+
+function useAuthSignature(wallet) {
+ const [sign, setSign] = useState(null);
+ const getSign = useCallback(async () => {
+ if (!wallet) return;
+ const data = Date.now().toString();
+ let signature = await wallet.signMessage(data);
+ signature = `${data}.${signature}`;
+ setSign(signature);
+ }, [wallet]);
+ useEffect(getSign, [getSign]);
+
+ return sign;
+}
+
+export default useAuthSignature;