fix(escrow): add merchant_registry.is_approved and fix escrow compile…

dabdub_contracts/contracts/merchant_registry/src/lib.rs

@@ -285,6 +285,18 @@ impl MerchantRegistryContract {
         record.status == MerchantStatus::Active
     }
 
+    /// Returns `true` when the merchant is registered, Active, and KYC verified.
+    /// Used by callers (e.g. payment_escrow) to gate deposits on merchant approval.
+    /// Returns `false` for unregistered merchants.
+    pub fn is_approved(env: Env, merchant: Address) -> bool {
+        let key = DataKey::Merchant(merchant);
+        if !env.storage().persistent().has(&key) {
+            return false;
+        }
+        let record: MerchantRecord = env.storage().persistent().get(&key).unwrap();
+        record.status == MerchantStatus::Active && record.kyc_verified
+    }
+
     /// Returns `true` when the merchant is KYC verified.
     /// Returns `false` for unregistered merchants.
     pub fn is_kyc_verified(env: Env, merchant: Address) -> bool {

dabdub_contracts/contracts/merchant_registry/src/test.rs

@@ -370,6 +370,47 @@ fn test_get_merchant_includes_kyc_field() {
     assert_eq!(record.kyc_verified, false);
 }
 
+// ---------------------------------------------------------------------------
+// is_approved
+// ---------------------------------------------------------------------------
+
+#[test]
+fn test_is_approved_false_until_kyc_verified() {
+    let (env, client, admin) = setup();
+    let merchant = Address::generate(&env);
+
+    client.register_merchant(&admin, &merchant, &sample_name(&env));
+    assert!(!client.is_approved(&merchant));
+}
+
+#[test]
+fn test_is_approved_true_when_active_and_kyc_verified() {
+    let (env, client, admin) = setup();
+    let merchant = Address::generate(&env);
+
+    client.register_merchant(&admin, &merchant, &sample_name(&env));
+    client.set_kyc_status(&admin, &merchant, &true);
+    assert!(client.is_approved(&merchant));
+}
+
+#[test]
+fn test_is_approved_false_when_suspended_even_if_kyc_verified() {
+    let (env, client, admin) = setup();
+    let merchant = Address::generate(&env);
+
+    client.register_merchant(&admin, &merchant, &sample_name(&env));
+    client.set_kyc_status(&admin, &merchant, &true);
+    client.suspend_merchant(&admin, &merchant);
+    assert!(!client.is_approved(&merchant));
+}
+
+#[test]
+fn test_is_approved_false_for_unknown() {
+    let (env, client, _admin) = setup();
+    let unknown = Address::generate(&env);
+    assert!(!client.is_approved(&unknown));
+}
+
 // ---------------------------------------------------------------------------
 // update_fee_tier / get_fee_tier
 // ---------------------------------------------------------------------------

dabdub_contracts/contracts/payment_escrow/src/lib.rs

@@ -341,8 +341,8 @@ impl PaymentEscrowContract {
         if remaining <= 0 {
             panic!("Payment fully released");
         }
+        Self::transfer_from_contract(&env, &payment.customer, remaining, &payment.asset_type);
 
-        Self::transfer_from_contract(&env, &payment.customer, remaining);
         payment.released_amount = payment.amount;
         payment.status = PaymentStatus::Expired;
         env.storage()
@@ -593,6 +593,13 @@ impl PaymentEscrowContract {
         payment.amount.saturating_sub(payment.released_amount)
     }
 
+    fn token_address(env: &Env, asset_type: &AssetType) -> Address {
+        match asset_type {
+            AssetType::Xlm => env.storage().instance().get(&DataKey::XlmToken).unwrap(),
+            AssetType::Usdc => env.storage().instance().get(&DataKey::UsdcToken).unwrap(),
+        }
+    }
+
     fn transfer_from_contract(env: &Env, recipient: &Address, amount: i128, asset_type: &AssetType) {
         let token_addr = Self::token_address(env, asset_type);
         token::Client::new(env, &token_addr)