response adaptation of fe.

Author: mertakdut

BankApplicationFrontend/src/components/MoneyBar/MoneyBar.js

@@ -53,11 +53,11 @@ class MoneyBar extends React.Component {
             const request = new Request().getRequestInstance(null, this.props.token);
             request.post(URL_RETRIEVEWEALTH, { username: this.props.loggedInUsername })
                 .then((response) => {
-                    Object.keys(response.data.wealthMap).map((key) => {
-                        if (response.data.wealthMap[key] == 0) delete response.data.wealthMap[key];
+                    Object.keys(response.data.wealth.wealthMap).map((key) => {
+                        if (response.data.wealth.wealthMap[key] == 0) delete response.data.wealth.wealthMap[key];
                     });
                     this.props.currenciesUptodate();
-                    this.setState({ ownedCurrencies: response.data.wealthMap });
+                    this.setState({ ownedCurrencies: response.data.wealth.wealthMap });
                 }).catch((error) => {
                     console.log(error.response);
                     var errorMessage = 'Network error.';

BankApplicationFrontend/src/components/pages/CurrencyPage/CurrencyList/Currency/BuySellModal/BuySellModal.js

@@ -46,7 +46,7 @@ class BuySellModal extends React.Component {
                 currency: this.props.currency,
                 amount: this.state.inputAmount
             }).then((response) => {
-                this.props.callback(true, (this.props.isBuying ? "Bought " : "Sold ") + response.data.amount + " " + response.data.currency + ".", 2);
+                this.props.callback(true, (this.props.isBuying ? "Bought " : "Sold ") + response.data.transaction.amount + " " + response.data.transaction.currency + ".", 2);
             }).catch((error) => {
                 console.log(error.response != null ? error.response : error);
                 var errorMessage = 'Network Error';

BankApplicationFrontend/src/components/pages/HistoryPage/HistoryPage.js

@@ -36,7 +36,7 @@ class HistoryPage extends React.Component {
                 username: this.props.loggedInUsername
             }).then((response) => {
                 console.log(response);
-                this.setState({ histories: response.data });
+                this.setState({ histories: response.data.transactionList });
             }).catch((error) => {
                 console.log(error.response);
                 var errorMessage = 'Network error';

BankApplicationFrontend/src/components/pages/TransferPage/TransferPage.js

@@ -65,7 +65,7 @@ class TransferPage extends React.Component {
                     amount: this.state.amount
                 }).then((response) => {
                     console.log(response);
-                    this.props.showPopup(2, 'Successfully transfered ' + response.data.amount + " " + response.data.currency + " to " + this.state.tcno + ".");
+                    this.props.showPopup(2, 'Successfully transfered ' + response.data.transfer.amount + " " + response.data.transfer.currency + " to " + this.state.tcno + ".");
                     this.props.currenciesNeedUpdate();
                 }).catch((error) => {
                     console.log(error.response != null ? error.response : error);

BankApplicationFrontend/src/components/pages/UsersPage/UsersPage.js

@@ -27,7 +27,7 @@ class UsersPage extends React.Component {
         request.get(URL_RETRIEVEALLUSERS)
             .then((response) => {
                 console.log(response);
-                this.setState({ users: response.data });
+                this.setState({ users: response.data.userList });
             }).catch((error) => {
                 console.log(error.response);
                 var errorMessage = 'Network error.';