Merge branch 'develop' into 'devops-staging'

Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!122

src/pages/Profile/Profile.js

@@ -65,7 +65,7 @@ export const Profile = observer(() => {
         store.transaction.getDataHistoryTransaction(),
       ]);
       await store.transaction.getDataHistoryTopUpProfile(
-        store.authentication.profileData?.userDetail?.id
+        store.authentication.profileData?.id
       );
       modalLoader.setLoading(false);
     })();

src/pages/Transaction/Transaction.js

@@ -175,7 +175,7 @@ export const Transaction = observer(() => {
             <Row>
               <Col span={24}>
                 <Select
-                  placeholder={"Select Category"}
+                  placeholder={"Pilih Kategori"}
                   allowClear={true}
                   onChange={(val) => handleChangeTabs(val)}
                   style={{ marginBottom: "10px", width: "100%" }}
@@ -191,13 +191,13 @@ export const Transaction = observer(() => {
 
             <Row>
               <span style={{ fontWeight: "bold", marginBottom: "10px" }}>
-                Sub Category
+                Sub Kategori
               </span>
             </Row>
             <Row>
               <Col span={24}>
                 <Select
-                  placeholder={"Select Sub Category"}
+                  placeholder={"Pilih Sub Kategori"}
                   allowClear={true}
                   onChange={(val) => handleChangeSubcategory(val)}
                   style={{ marginBottom: "10px", width: "100%" }}