diff --git a/app/src/main/java/com/example/bondoman/LoginActivity.kt b/app/src/main/java/com/example/bondoman/LoginActivity.kt
index 46560ff0b1ee0e10f6a3565a609e9f614f22602b..3b469221573494ba65b1981a9f26ebd8a5b22c7e 100644
--- a/app/src/main/java/com/example/bondoman/LoginActivity.kt
+++ b/app/src/main/java/com/example/bondoman/LoginActivity.kt
@@ -43,6 +43,7 @@ class LoginActivity : AppCompatActivity() {
                         val editor = sharedPreferences.edit()
                         editor.apply {
                             putString("TOKEN", token)
+                            putString("EMAIL", email)
                         }.apply()
                         val intent = Intent(this@LoginActivity, MainActivity::class.java)
                         startActivity(intent)
diff --git a/app/src/main/java/com/example/bondoman/SettingFragment.kt b/app/src/main/java/com/example/bondoman/SettingFragment.kt
index a3a8a98b2b3e7449b1eff96048f7b50cd2a76073..4e7cb15fd2dfd4a41efaf6691ac9fd2fdca03728 100644
--- a/app/src/main/java/com/example/bondoman/SettingFragment.kt
+++ b/app/src/main/java/com/example/bondoman/SettingFragment.kt
@@ -1,6 +1,7 @@
 package com.example.bondoman
 import android.app.AlertDialog
 import android.content.ActivityNotFoundException
+import android.content.Context
 import android.content.Context.MODE_PRIVATE
 import android.content.Intent
 import android.graphics.Color
@@ -20,6 +21,9 @@ import com.example.bondoman.databinding.FragmentSettingBinding
 import com.example.bondoman.helper.Xls
 import com.example.bondoman.retrofit.data.TransactionDB
 import com.example.bondoman.services.RandomizeTransaction
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 import kotlin.random.Random
 
 class SettingFragment: Fragment() {
@@ -88,14 +92,21 @@ class SettingFragment: Fragment() {
     }
 
     private fun sendEmail() {
+        val sharedPreferences =
+            requireActivity().getSharedPreferences(
+                "sharedPrefs",
+                Context.MODE_PRIVATE
+            )
+        val email = sharedPreferences.getString("EMAIL", "") ?: ""
+
         // Create an intent to send an email
         val intent = Intent(Intent.ACTION_SEND)
         intent.type = "message/rfc822" // Email MIME type
-
+        val currentDate = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
         // Fill in the email details (optional)
-        intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("bintanghijriawan433@gmail.com"))
-        intent.putExtra(Intent.EXTRA_SUBJECT, "Subject")
-        intent.putExtra(Intent.EXTRA_TEXT, "Body of the email")
+        intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
+        intent.putExtra(Intent.EXTRA_SUBJECT, "Daftar Transaksi")
+        intent.putExtra(Intent.EXTRA_TEXT, "Daftar Transaksi $currentDate")
 
         try {
             // Start the email activity
diff --git a/app/src/main/java/com/example/bondoman/TransactionFragment.kt b/app/src/main/java/com/example/bondoman/TransactionFragment.kt
index 32c455c45274ec818519807b0bd4d4933dce18d5..d4b76b3242da331559a036d889db1d29354c430c 100644
--- a/app/src/main/java/com/example/bondoman/TransactionFragment.kt
+++ b/app/src/main/java/com/example/bondoman/TransactionFragment.kt
@@ -63,8 +63,6 @@ class TransactionFragment : Fragment() {
         graphButton.isSelected = false
         settingButton.isSelected = false
 
-
-
         return binding.root
     }
 
@@ -72,18 +70,6 @@ class TransactionFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         adapter = TransactionAdapter(listTransaction)
-
-        transactionData = binding.itemTransaction
-        transactionData.adapter = adapter
-        transactionData.layoutManager =
-            LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
-        transactionData.addItemDecoration(
-            DividerItemDecoration(
-                requireContext(),
-                RecyclerView.VERTICAL
-            )
-        )
-
         db = ViewModelProvider(requireActivity())[DBViewModel::class.java]
 
         Log.d("PENDING LIST NOT EMPTY?", pendingTransaction.isNotEmpty().toString())
@@ -97,6 +83,16 @@ class TransactionFragment : Fragment() {
             }
             pendingTransaction.clear()
         }
+        transactionData = binding.itemTransaction
+        transactionData.adapter = adapter
+        transactionData.layoutManager =
+            LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
+        transactionData.addItemDecoration(
+            DividerItemDecoration(
+                requireContext(),
+                RecyclerView.VERTICAL
+            )
+        )
 
         binding.addButton.setOnClickListener {
             val intent = Intent(requireContext(), ContainerActivity::class.java)
diff --git a/app/src/main/java/com/example/bondoman/retrofit/data/dao/TransactionDao.kt b/app/src/main/java/com/example/bondoman/retrofit/data/dao/TransactionDao.kt
index ffbf90ab7f5b14dcfe1d6a5cf99d96d687070f42..70bcbec6dd87820555523a883f3d890490423ebc 100644
--- a/app/src/main/java/com/example/bondoman/retrofit/data/dao/TransactionDao.kt
+++ b/app/src/main/java/com/example/bondoman/retrofit/data/dao/TransactionDao.kt
@@ -33,4 +33,6 @@ interface TransactionDao {
     @Query("SELECT kategori_transaksi as category, SUM(nominal_transaksi) as amount FROM transactionentity GROUP BY kategori_transaksi")
     fun sumPriceByCategory(): List<GraphData>
 
+    @Query("SELECT 'kategori_transaksi' as 'category', 'nominal_transaksi' as 'amount' FROM transactionentity GROUP BY 'kategori_transaksi'")
+    fun sumPriceByCategory(): List<GraphData>
 }
\ No newline at end of file