diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 5f39827..5d851ec 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -57,32 +57,32 @@ export const Profile = observer(() => {
Profile
- {/**/}
- {/* */}
- {/* Name*/}
- {/* */}
- {/* */}
- {/* {store.authentication.profileData.username}*/}
- {/* */}
- {/* */}
- {/* Role*/}
- {/* */}
- {/* */}
- {/* {store.authentication.profileData.roles.name}*/}
- {/* */}
- {/* */}
- {/* Superior*/}
- {/* */}
- {/* */}
- {/* {store.authentication.profileData.superior.username}*/}
- {/* */}
- {/* */}
- {/* Wallet*/}
- {/* */}
- {/* */}
- {/* {store.authentication.profileData.wallet}*/}
- {/* */}
- {/*
*/}
+
+
+ Name
+
+
+ {store.authentication.profileData?.username}
+
+
+ Role
+
+
+ {store.authentication.profileData.roles?.name}
+
+
+ Superior
+
+
+ {store.authentication.profileData.superior?.username}
+
+
+ Wallet
+
+
+ {store.authentication.profileData.wallet}
+
+
diff --git a/src/store/authentication.js b/src/store/authentication.js
index 526f512..eb541b0 100644
--- a/src/store/authentication.js
+++ b/src/store/authentication.js
@@ -53,7 +53,7 @@ export class Authentication {
async getProfile() {
try {
const response = await http.get('/auth/profile');
- this.profileData = response.body.data;
+ this.profileData = response.body;
} catch (e) {
console.error(e);
throw e;
diff --git a/src/store/transaction.js b/src/store/transaction.js
index 50cd379..63b8c31 100644
--- a/src/store/transaction.js
+++ b/src/store/transaction.js
@@ -20,7 +20,7 @@ export class Transaction {
total_dataSubCategories = 0;
pageHistoryTransaction = 0;
- pageSizeHistoryTransaction = 10
+ // pageSizeHistoryTransaction = 10
dataHistoryTransaction = [];
total_dataHistoryTransaction = 0;
@@ -53,7 +53,7 @@ export class Transaction {
}
async getDataHistoryTransaction() {
- const response = await http.get(`/transaction/history?page=${this.pageHistoryTransaction}&pageSize=${this.pageSizeHistoryTransaction}`);
+ const response = await http.get(`/transaction/history?page=${this.pageHistoryTransaction}`);
this.dataHistoryTransaction = response.body.data ?? []
this.total_dataHistoryTransaction = response.body.total_data ?? 0