From 782f43059d44e60f5bb94e1f2c0e33fa81bc8c41 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 20 May 2020 11:25:09 +0100
Subject: [PATCH] Refactor to pass through whole postal address
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s a bit cleaner to not be passing through multiple variables which
are properties of the same object.
---
 app/main/views/uploads.py                | 3 +--
 app/templates/views/uploads/preview.html | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py
index 0e29c13c2..67b0f606c 100644
--- a/app/main/views/uploads.py
+++ b/app/main/views/uploads.py
@@ -299,8 +299,7 @@ def uploaded_letter_preview(service_id, file_id):
         message=error_message,
         error_code=error_shortcode,
         form=form,
-        recipient=postal_address.as_single_line,
-        international=postal_address.international,
+        postal_address=postal_address,
         re_upload_form=re_upload_form
     )
 
diff --git a/app/templates/views/uploads/preview.html b/app/templates/views/uploads/preview.html
index 602705559..5e9538a98 100644
--- a/app/templates/views/uploads/preview.html
+++ b/app/templates/views/uploads/preview.html
@@ -48,11 +48,11 @@
     {% if status == 'valid' %}
     <div class="js-stick-at-bottom-when-scrolling">
       <p class="top-gutter-0 bottom-gutter-1-2 send-recipient" title="{{ recipient }}">
-        Recipient: {{ recipient }}
+        Recipient: {{ postal_address.as_single_line }}
       </p>
 
       {% if current_service.live %}
-        {% if international %}
+        {% if postal_address.international %}
           <p class="govuk-body">
             Postage: international
           </p>