commit e01577b1248f30b89770a3d670d3b4d3d20a537e
parent 5792afcb3bcf8b9d16c0fcaa638e7d7986f58b0d
Author: tanhengyeow <E0032242@u.nus.edu>
Date: Fri, 17 Jul 2020 10:57:50 +0800
Update new components in Activity page
Diffstat:
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/frontend/src/components/activity/AddPaymentInitiationDrawer.tsx b/frontend/src/components/activity/AddPaymentInitiationDrawer.tsx
@@ -8,7 +8,7 @@ const layout = {
};
const AddPaymentInitiationDrawer = (props) => {
- const { visible, onClose } = props;
+ const { visible, onClose, updatePaymentInitiations } = props;
const [accountsList, setAccountsList] = useState([]);
@@ -85,6 +85,7 @@ const AddPaymentInitiationDrawer = (props) => {
.then(() => (isError = false))
.catch((err) => showError(err));
if (!isError) {
+ await updatePaymentInitiations();
onClose();
}
};
diff --git a/frontend/src/components/activity/Index.tsx b/frontend/src/components/activity/Index.tsx
@@ -1,11 +1,13 @@
import React, { useState } from 'react';
-import { Button, Tabs } from 'antd';
+import { Tabs } from 'antd';
+import PaymentInitiationList from './PaymentInitiationList';
+
import './Activity.less';
-import AddPaymentInitiationDrawer from './AddPaymentInitiationDrawer';
const { TabPane } = Tabs;
const Activity = () => {
const [visible, setVisible] = useState(false);
+
const showDrawer = () => {
setVisible(true);
};
@@ -17,12 +19,11 @@ const Activity = () => {
<div className="activity">
<Tabs defaultActiveKey="1" type="card" size="large">
<TabPane tab="Payments" key="1">
- <div className="buttons-row">
- <Button type="primary" size="middle" onClick={showDrawer}>
- Add payment initiation
- </Button>
- <AddPaymentInitiationDrawer visible={visible} onClose={onClose} />
- </div>
+ <PaymentInitiationList
+ visible={visible}
+ onClose={onClose}
+ showDrawer={showDrawer}
+ />
</TabPane>
<TabPane tab="Transaction History" key="2">
Transaction History