diff --git a/app/build.gradle b/app/build.gradle
index cd2dff6..01b1416 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,6 +5,16 @@ plugins {
 }
 
 android {
+
+    signingConfigs {
+        release {
+            storeFile file('D:\\Capstone-Project\\mykeystore\\foodify-shipper.jks')
+            storePassword 'Phanhuuloi2@@1'
+            keyAlias 'foodify-shipper'
+            keyPassword 'Phanhuuloi2@@1'
+        }
+    }
+
     namespace 'com.capstone.foodify.shipper'
     compileSdk 31
 
@@ -34,6 +44,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
     compileOptions {
@@ -76,6 +87,6 @@ dependencies {
     // ADD the API-only library to all variants
     implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta08'
 
-    implementation(project(':aestheticdialogs'))
-    implementation(project(':SJDialog'))
+    implementation 'com.github.gabriel-TheCode:AestheticDialogs:1.3.6'
+    implementation 'com.github.SlaVcE14:SJ-Dialog:1.6'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
index 666d64a..37c710b 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
@@ -208,7 +208,14 @@ public class OrderDetailActivity extends AppCompatActivity {
         geofencingClient = LocationServices.getGeofencingClient(this);
         geofenceHelper = new GeofenceHelper(this);
 
-        if(!order.getStatus().equals(COMPLETE_STATUS) || !order.getStatus().equals(CANCEL_STATUS)){
+        if(order.getStatus().equals(COMPLETE_STATUS) || order.getStatus().equals(CANCEL_STATUS)){
+            btn_call.setVisibility(View.GONE);
+            btn_shipping.setVisibility(View.GONE);
+            btn_cancel_order.setVisibility(View.GONE);
+            btn_confirm_ship_completed.setVisibility(View.GONE);
+
+            progressLayout.setVisibility(View.GONE);
+        } else {
             getLocation();
 
             final Handler handler = new Handler(Looper.getMainLooper());
@@ -225,13 +232,6 @@ public class OrderDetailActivity extends AppCompatActivity {
                     }
                 }
             }, 5000);
-        } else {
-            btn_call.setVisibility(View.GONE);
-            btn_shipping.setVisibility(View.GONE);
-            btn_cancel_order.setVisibility(View.GONE);
-            btn_confirm_ship_completed.setVisibility(View.GONE);
-
-            progressLayout.setVisibility(View.GONE);
         }
     }
 
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Common.java b/app/src/main/java/com/capstone/foodify/shipper/Common.java
index 0499e04..e16252d 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Common.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Common.java
@@ -30,8 +30,8 @@ public class Common {
     public static FirebaseUser FIREBASE_USER = null;
     public static Location CURRENT_LOCATION = null;
     public static final FirebaseAppDistribution firebaseAppDistribution = FirebaseAppDistribution.getInstance();
-    public static final String BASE_URL = "https://foodify-backend-production.up.railway.app/api/";
-    public static final String MAP_API = "AIzaSyAY14Ic32UP26Hg6GILznOfbBihiY5BUxw";
+    public static final String BASE_URL = "https://foodify.up.railway.app/api/";
+    public static final String MAP_API = "AIzaSyADfFAkQxU6yfPAUsNfZjHgFgFwQnNeeWY";
     public static final String FORMAT_DATE="dd-MM-yyyy";
     public static final String VALID_EMAIL_ADDRESS_REGEX = "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$";
     public static final String PASSWORD_PATTERN = "^(?=.*[0-9])(?=.*[A-Z])(?=.*[@#$%^&+=!_])(?=\\S+$).{4,}$";
diff --git a/settings.gradle b/settings.gradle
index 8db5dcd..d2c5e8a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,5 +16,3 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Foodify Shipper"
 include ':app'
-include ':aestheticdialogs'
-include ':SJDialog'