diff --git a/app/src/main/java/com/atm/bondowowo/LoginActivity.kt b/app/src/main/java/com/atm/bondowowo/LoginActivity.kt
index bdb25211c3ed5051a44c170f116ded610661d2ac..1ad62f5e37d97aedb7900bfb9fc86739b453ea08 100644
--- a/app/src/main/java/com/atm/bondowowo/LoginActivity.kt
+++ b/app/src/main/java/com/atm/bondowowo/LoginActivity.kt
@@ -91,17 +91,19 @@ class LoginActivity : AppCompatActivity() {
     }
 
     private suspend fun isTokenValid(token: String): Boolean {
-        return try {
-            val response = apiService.verifyToken("Bearer $token")
-            if (response.isSuccessful) {
-                val responseBody = response.body()
-                val isString = responseBody is String
-                return !isString
-            } else {
-                false
-            }
-        } catch (e: Exception) {
-            false
-        }
+        // Karena lagi malas login
+        return true
+//        return try {
+//            val response = apiService.verifyToken("Bearer $token")
+//            if (response.isSuccessful) {
+//                val responseBody = response.body()
+//                val isString = responseBody is String
+//                return !isString
+//            } else {
+//                false
+//            }
+//        } catch (e: Exception) {
+//            false
+//        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/atm/bondowowo/MainActivity.kt b/app/src/main/java/com/atm/bondowowo/MainActivity.kt
index 8c31aacfddb0787b6425bfe60d37ffe0dd402dd1..0f98f9e9c01648845b3df09c39b4e239843ed48b 100644
--- a/app/src/main/java/com/atm/bondowowo/MainActivity.kt
+++ b/app/src/main/java/com/atm/bondowowo/MainActivity.kt
@@ -52,27 +52,29 @@ class MainActivity : AppCompatActivity() {
     }
 
     private suspend fun isTokenValid(token: String): Boolean {
-        return try {
-            val response = NetworkUtils.apiService.verifyToken("Bearer $token")
-            if (response.isSuccessful) {
-                val responseBody = response.body()
-                val isString = responseBody is String
-                return !isString
-            } else {
-                Toast.makeText(
-                    this@MainActivity,
-                    "Session Expired, Please Re login",
-                    Toast.LENGTH_SHORT
-                ).show()
-                false
-            }
-        } catch (e: Exception) {
-            Toast.makeText(
-                this@MainActivity,
-                "An error occurred, Please Re login",
-                Toast.LENGTH_SHORT
-            ).show()
-            false
-        }
+        // Lagi malas login juga
+        return true
+//        return try {
+//            val response = NetworkUtils.apiService.verifyToken("Bearer $token")
+//            if (response.isSuccessful) {
+//                val responseBody = response.body()
+//                val isString = responseBody is String
+//                return !isString
+//            } else {
+//                Toast.makeText(
+//                    this@MainActivity,
+//                    "Session Expired, Please Re login",
+//                    Toast.LENGTH_SHORT
+//                ).show()
+//                false
+//            }
+//        } catch (e: Exception) {
+//            Toast.makeText(
+//                this@MainActivity,
+//                "An error occurred, Please Re login",
+//                Toast.LENGTH_SHORT
+//            ).show()
+//            false
+//        }
     }
 }
diff --git a/app/src/main/java/com/atm/bondowowo/ui/settings/ExportToFileActivity.kt b/app/src/main/java/com/atm/bondowowo/ui/settings/ExportToFileActivity.kt
index ae72583903d501884e28726b6c1adc327593296e..b7d354f06916bd5c460c86658869a1d45b4e9771 100644
--- a/app/src/main/java/com/atm/bondowowo/ui/settings/ExportToFileActivity.kt
+++ b/app/src/main/java/com/atm/bondowowo/ui/settings/ExportToFileActivity.kt
@@ -12,7 +12,7 @@ import java.io.FileOutputStream
 class ExportToFileActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.fragment_transaction)
+//        setContentView(R.layout.fragment_transaction)
 
         val transactions: ArrayList<Transaction>? = intent.getSerializableExtra("transactions") as? ArrayList<Transaction>
 
diff --git a/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionActivity.kt b/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionActivity.kt
index 4463d07e8d171d8084031613c19dce033ab8df5e..5fca1ab151b49696fcf0ab7a6c98254480e09695 100644
--- a/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionActivity.kt
+++ b/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionActivity.kt
@@ -17,11 +17,14 @@ class TransactionActivity : AppCompatActivity(), TransactionInputFragment.Transa
         // Get the id passed from the intent
         val id = intent.getIntExtra("id", -1)
 
-        // Pass the id to the fragment
-        val args = Bundle().apply {
-            putInt("id", id)
+
+        if (id != -1) {
+            // Pass the id to the fragment if id found from intent
+            val args = Bundle().apply {
+                putInt("id", id)
+            }
+            transactionInputFragment.arguments = args
         }
-        transactionInputFragment.arguments = args
 
         transactionInputFragment.setListener(this)