diff --git a/src/screens/Loan/LoanPaidOffLetterOrderDetailsScreen.js b/src/screens/Loan/LoanPaidOffLetterOrderDetailsScreen.js
index f6fd36c..d0c554e 100644
--- a/src/screens/Loan/LoanPaidOffLetterOrderDetailsScreen.js
+++ b/src/screens/Loan/LoanPaidOffLetterOrderDetailsScreen.js
@@ -70,16 +70,56 @@ const LoanPaidOffLetterOrderDetailsScreen = () => {
-
- Güwanama detallary
+
+ Güwanama {order.id}
- {Object.entries(order).map(([key, value]) => (
-
- {key}
- {String(value)}
-
- ))}
+ {[
+ 'id',
+ 'region',
+ 'branch_id',
+ 'customer_name',
+ 'customer_surname',
+ 'customer_patronic_name',
+ 'born_at',
+ 'phone',
+ 'passport_serie',
+ 'passport_id',
+ 'status',
+ 'notes',
+ 'loan_contract_number',
+ 'loan_contract_date',
+ 'loan_amount',
+ 'loan_reason',
+ ].filter((k) => order[k] !== undefined && order[k] !== null).map((key, idx, arr) => {
+ const titles = {
+ id: 'ID',
+ region: 'Welaýat',
+ branch_id: 'Şahamça',
+ customer_name: 'Ady',
+ customer_surname: 'Familiýasy',
+ customer_patronic_name: 'Atasynyň ady',
+ born_at: 'Doglan senesi',
+ phone: 'Telefon',
+ passport_serie: 'Passport seriýa',
+ passport_id: 'Passport nomer',
+ status: 'Status',
+ notes: 'Bellikler',
+ loan_contract_number: 'Karz şertnamanyň belgisi',
+ loan_contract_date: 'Karz şertnamanyň senesi',
+ loan_amount: 'Karzyň möçberi',
+ loan_reason: 'Karzyň maksady',
+ };
+ return (
+
+ {titles[key]}
+ {String(order[key])}
+
+ );
+ })}
@@ -105,6 +145,7 @@ const styles = StyleSheet.create({
backBtn: {
alignSelf: 'flex-end',
marginBottom: 16,
+ marginRight: 24,
},
title: {
fontSize: 24,
@@ -121,7 +162,11 @@ const styles = StyleSheet.create({
detailRow: {
flexDirection: 'row',
justifyContent: 'space-between',
- marginBottom: 12,
+ paddingVertical: 12,
+ },
+ detailRowBorder: {
+ borderBottomWidth: 1,
+ borderBottomColor: COLORS.border,
},
detailKey: {
fontWeight: '600',