diff --git a/app/src/main/java/com/example/if3210_2024_android_aab/EditTransactionActivity.kt b/app/src/main/java/com/example/if3210_2024_android_aab/EditTransactionActivity.kt
index a009e15eb5721be813006c972e2dda68fe13a9a8..ef2c21b82b4767f1d36fcb0c5e7b9990d7178752 100644
--- a/app/src/main/java/com/example/if3210_2024_android_aab/EditTransactionActivity.kt
+++ b/app/src/main/java/com/example/if3210_2024_android_aab/EditTransactionActivity.kt
@@ -8,6 +8,7 @@ import android.util.Log
 import android.widget.EditText
 import android.widget.RadioButton
 import android.widget.RadioGroup
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
@@ -68,7 +69,12 @@ class EditTransactionActivity : ComponentActivity() {
                 || TextUtils.isEmpty(editNominal.text)
                 || TextUtils.isEmpty(editLokasi.text)
                 || radioGroup.checkedRadioButtonId == -1){
-                setResult(Activity.RESULT_CANCELED, replyIntent)
+//                setResult(Activity.RESULT_CANCELED, replyIntent)
+                Toast.makeText(
+                    applicationContext,
+                    "Data tidak lengkap",
+                    Toast.LENGTH_LONG
+                ).show()
             } else {
                 val judul = editJudul.text.toString()
                 val nominal = Integer.parseInt(editNominal.text.toString())
@@ -88,8 +94,8 @@ class EditTransactionActivity : ComponentActivity() {
                 replyIntent.putExtra("isEdit",true)
                 Log.d("EditTransactionActivity", Activity.RESULT_OK.toString())
                 setResult(Activity.RESULT_OK, replyIntent)
+                finish()
             }
-            finish()
         }
     }
 
diff --git a/app/src/main/java/com/example/if3210_2024_android_aab/NewTransactionActivity.kt b/app/src/main/java/com/example/if3210_2024_android_aab/NewTransactionActivity.kt
index 73e1ee6cca9b472ff3115898714dff29d2fa01e3..94da877da2919c818241fbcf9135e1e3065fcd3f 100644
--- a/app/src/main/java/com/example/if3210_2024_android_aab/NewTransactionActivity.kt
+++ b/app/src/main/java/com/example/if3210_2024_android_aab/NewTransactionActivity.kt
@@ -8,6 +8,7 @@ import android.util.Log
 import android.widget.EditText
 import android.widget.RadioButton
 import android.widget.RadioGroup
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
@@ -46,7 +47,12 @@ class NewTransactionActivity:AppCompatActivity() {
                 || TextUtils.isEmpty(editNominal.text)
                 || TextUtils.isEmpty(editLokasi.text)
                 || radioGroup.checkedRadioButtonId == -1){
-                setResult(Activity.RESULT_CANCELED, replyIntent)
+//                setResult(Activity.RESULT_CANCELED, replyIntent)
+                Toast.makeText(
+                    applicationContext,
+                    "Data tidak lengkap",
+                    Toast.LENGTH_LONG
+                ).show()
             } else {
                 val judul = editJudul.text.toString()
                 val nominal = Integer.parseInt(editNominal.text.toString())
@@ -63,8 +69,8 @@ class NewTransactionActivity:AppCompatActivity() {
                 replyIntent.putExtra(EXTRA_LOKASI, lokasi)
                 replyIntent.putExtra(EXTRA_ISPEMASUKAN, isPemasukan)
                 setResult(Activity.RESULT_OK, replyIntent)
+                finish()
             }
-            finish()
         }
     }
 
diff --git a/app/src/main/res/layout/activity_edit_transaction.xml b/app/src/main/res/layout/activity_edit_transaction.xml
index 34431fb048f489f770c8020a42d368a7dd411e8b..f25eb12657b281752485ebcb59b864f3d3efdf42 100644
--- a/app/src/main/res/layout/activity_edit_transaction.xml
+++ b/app/src/main/res/layout/activity_edit_transaction.xml
@@ -25,6 +25,7 @@
         android:layout_marginEnd="16dp"
         android:fontFamily="sans-serif-light"
         android:inputType="text"
+        android:maxLength="30"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -51,6 +52,7 @@
         android:layout_marginEnd="16dp"
         android:ems="10"
         android:inputType="number"
+        android:maxLength="9"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -107,11 +109,12 @@
         android:id="@+id/edit_transaction_lokasi_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="20dp"
         android:text="Lokasi"
         android:textSize="24sp"
-        app:layout_constraintTop_toBottomOf="@+id/edit_transaction_kategori_radio_group"
-        tools:layout_editor_absoluteX="16dp" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/edit_transaction_kategori_radio_group" />
 
     <EditText
         android:id="@+id/edit_transaction_edit_lokasi"
@@ -122,6 +125,7 @@
         android:layout_marginEnd="16dp"
         android:ems="10"
         android:inputType="text"
+        android:maxLength="30"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_new_transaction.xml b/app/src/main/res/layout/activity_new_transaction.xml
index 2a4d8472eb36647d2a8b9bc00616001c84a35b5f..d228fe6b2424eca5e6fd1f1c3a4a27fa4fef373f 100644
--- a/app/src/main/res/layout/activity_new_transaction.xml
+++ b/app/src/main/res/layout/activity_new_transaction.xml
@@ -25,6 +25,7 @@
         android:layout_marginEnd="16dp"
         android:fontFamily="sans-serif-light"
         android:inputType="text"
+        android:maxLength="30"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -51,6 +52,7 @@
         android:layout_marginEnd="16dp"
         android:ems="10"
         android:inputType="number"
+        android:maxLength="9"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -107,11 +109,12 @@
         android:id="@+id/lokasi_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="20dp"
         android:text="Lokasi"
         android:textSize="24sp"
-        app:layout_constraintTop_toBottomOf="@+id/kategori_radio_group"
-        tools:layout_editor_absoluteX="16dp" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/kategori_radio_group" />
 
     <EditText
         android:id="@+id/edit_lokasi"
@@ -122,6 +125,7 @@
         android:layout_marginEnd="16dp"
         android:ems="10"
         android:inputType="text"
+        android:maxLength="30"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"