diff --git a/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt b/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt
index cfdd0d6e97b83cdcccca6ce92f29b52b1423585b..4fecdfe451ea52f823c5906d197fc59a9c1de253 100644
--- a/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt
+++ b/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt
@@ -133,17 +133,25 @@ class TransactionFragment : Fragment() {
         }
 
         xlsSave.setOnClickListener {
-             createExcelFile(transactionAdapter.getTransactionList(), "xls")
+            val workbook: Workbook = createExcelFile(transactionAdapter.getTransactionList(), "xls")
+            saveWorkBook(workbook, "xls")
+            xlsSave.visibility = View.GONE
+            xlsxSave.visibility = View.GONE
+            Toast.makeText(requireContext(), "Transaction Report.xls is downloaded", Toast.LENGTH_LONG).show()
         }
 
         xlsxSave.setOnClickListener {
-            createExcelFile(transactionAdapter.getTransactionList(), "xlsx")
+            val workbook: Workbook = createExcelFile(transactionAdapter.getTransactionList(), "xlsx")
+            saveWorkBook(workbook, "xlsx")
+            xlsSave.visibility = View.GONE
+            xlsxSave.visibility = View.GONE
+            Toast.makeText(requireContext(), "Transaction Report.xlsx is downloaded", Toast.LENGTH_LONG).show()
         }
 
         return view
     }
 
-    private fun createExcelFile(transactions : List<Transaction>, extension: String) {
+    private fun createExcelFile(transactions : List<Transaction>, extension: String) : Workbook{
         var workbook : Workbook
         var sheet : Sheet
         if (extension == "xls"){
@@ -182,7 +190,7 @@ class TransactionFragment : Fragment() {
             cell.setCellValue(transactions[i].location)
         }
 
-        saveWorkBook(workbook, extension)
+        return workbook
     }
     private fun saveWorkBook(workbook: Workbook, extension: String) {
         val appDirectory = requireContext().filesDir
@@ -193,14 +201,12 @@ class TransactionFragment : Fragment() {
             if(!filepath.exists()){
                 filepath.createNewFile()
             }
-            Log.i("Write file", filepath.toString())
             val fileOutputStream : FileOutputStream = FileOutputStream(filepath)
             workbook.write(fileOutputStream)
             fileOutputStream.flush()
             fileOutputStream.close()
 
         }catch (e:Exception){
-            Log.i("Write file", "Failed ${filepath.toString()}")
             e.printStackTrace()
         }
     }