From e07a17eff5626b45066a5925dbb3e5a8acc07edb Mon Sep 17 00:00:00 2001
From: Aman Agrawal <amanagr@zulip.com>
Date: Tue, 20 May 2025 14:48:51 +0530
Subject: [PATCH] slack_import: Add instruction to get export file.

---
 templates/zerver/slack_import.html | 7 ++++++-
 zerver/views/registration.py       | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/templates/zerver/slack_import.html b/templates/zerver/slack_import.html
index 66ea78ea7b..e5c8dbe361 100644
--- a/templates/zerver/slack_import.html
+++ b/templates/zerver/slack_import.html
@@ -63,7 +63,12 @@
                 </form>
                 {% if slack_access_token %}
                 <div class="input-box" id="slack-import-drag-drop-wrapper">
-                    <label for="slack-import-drag-and-drop" class="inline-block label-title">{{ _('Import your data') }}</label>
+                    <label for="slack-import-drag-and-drop" class="inline-block label-title">{{ _('Upload your Slack export file') }}</label>
+                    <div class="not-editable-realm-field">
+                        {% trans %}
+                        Follow <a href="https://zulip.com/help/import-from-slack#export-your-slack-data" target="_blank" rel="noopener noreferrer">these instructions</a> to obtain your Slack message history export.
+                        {% endtrans %}
+                    </div>
                     <div id="slack-import-drag-and-drop" data-max-file-size="{{max_file_size}}"></div>
                 </div>
                 <form id="slack-import-start-upload-wrapper" method="post" class="form-inline {% if uploaded_import_file_name %}{% else %}hidden{% endif %}" action="{{ url('import_realm_from_slack') }}">
diff --git a/zerver/views/registration.py b/zerver/views/registration.py
index ad3fd7a7b4..8b7637beca 100644
--- a/zerver/views/registration.py
+++ b/zerver/views/registration.py
@@ -362,7 +362,10 @@ def registration_helper(
 
             saved_slack_access_token = prereg_realm.data_import_metadata.get("slack_access_token")
             if saved_slack_access_token or slack_access_token is not None:
-                if slack_access_token is not None and slack_access_token != saved_slack_access_token:
+                if (
+                    slack_access_token is not None
+                    and slack_access_token != saved_slack_access_token
+                ):
                     # Verify slack token access.
                     from zerver.data_import.slack import (
                         SLACK_IMPORT_TOKEN_SCOPES,