[Reimbursements] Fix the "Open on Wise" recipient link

app/javascript/controllers/strip_prefix_controller.js

@@ -1,6 +1,7 @@
 import { Controller } from '@hotwired/stimulus'
 
-// Pasting a full URL into an id field should leave just the id behind.
+// Pasting a full URL into an id field should leave just the id behind,
+// without any query string or fragment.
 export default class extends Controller {
   static values = { prefix: String }
 
@@ -9,6 +10,8 @@ export default class extends Controller {
     if (!pasted.startsWith(this.prefixValue)) return
 
     event.preventDefault()
-    event.target.value = pasted.substring(this.prefixValue.length)
+    event.target.value = pasted
+      .substring(this.prefixValue.length)
+      .split(/[?#]/)[0]
   }
 }

app/models/concerns/has_wise_recipient.rb

@@ -7,6 +7,9 @@ module HasWiseRecipient
     include CountryEnumable
     has_country_enum(field: :recipient_country)
 
+    before_validation(:normalize_wise_recipient_id)
+    validates(:wise_recipient_id, format: { with: WISE_RECIPIENT_ID_FORMAT, message: "is not a valid Wise recipient ID" }, allow_nil: true)
+
     validate do
       if POSTAL_CODE_FORMATS[recipient_country&.to_sym] && !address_postal_code.match(POSTAL_CODE_FORMATS[recipient_country.to_sym])
         errors.add(:address_postal_code, "does not meet the required format for this country")
@@ -147,6 +150,28 @@ def unsupported_account_type_reason
     HasWiseRecipient.unsupported_account_type_reason(account_type)
   end
 
+  def wise_recipient_url
+    return nil unless wise_recipient_id.present?
+
+    "https://wise.com/recipients/#{CGI.escape(wise_recipient_id)}"
+  end
+
+  # Admins paste the recipient's Wise URL (e.g. https://wise.com/recipients/<uuid>?new=undefined),
+  # so keep only the UUID
+  def normalize_wise_recipient_id
+    return unless wise_recipient_id_changed?
+
+    normalized = wise_recipient_id&.strip.presence
+
+    if normalized.nil? || normalized.match?(WISE_RECIPIENT_ID_FORMAT)
+      self.wise_recipient_id = normalized
+      return
+    end
+
+    match = WISE_RECIPIENT_ID_REGEXP.match(normalized)
+    self.wise_recipient_id = match[1] if match
+  end
+
   # Postal code formats sourced from https://column.com/docs/international-wires/country-specific-details
 
   POSTAL_CODE_FORMATS = {
@@ -175,6 +200,9 @@ def self.unsupported_account_type_reason(account_type)
 
   ACCOUNT_NUMBER_FIELD = { type: :text_field, key: "account_number", placeholder: "123456789", label: "Account number" }.freeze
 
+  WISE_RECIPIENT_ID_FORMAT = /\A[\h-]{36}\z/
+  WISE_RECIPIENT_ID_REGEXP = /wise\.com\/recipients\/([\h-]{36})/
+
   AVAILABLE_CURRENCIES = %w[AED ARS AUD BGN BRL CAD CHF CLP CNY COP CZK DKK EGP EUR GBP GEL HKD HUF IDR ILS JPY KES KRW LKR MAD MXN MYR NGN NOK NPR NZD PHP PKR PLN RON SEK SGD THB TND TRY UAH UYU VND ZAR].freeze
 
 end

app/models/wise_transfer.rb

@@ -89,9 +89,6 @@ class WiseTransfer < ApplicationRecord
   validates(:wise_id, format: { with: WISE_ID_FORMAT, message: "is not a valid Wise ID" }, allow_nil: true)
   validates(:wise_id, presence: true, if: :processed?)
 
-  WISE_RECIPIENT_ID_FORMAT = /\A[\h-]{36}\z/
-  before_validation(:normalize_wise_recipient_id)
-  validates(:wise_recipient_id, format: { with: WISE_RECIPIENT_ID_FORMAT, message: "is not a valid Wise recipient ID" }, allow_nil: true)
   validates(:wise_recipient_id, presence: true, if: :processed?)
 
   after_create do
@@ -277,12 +274,6 @@ def wise_url
     "https://wise.com/transactions/activities/by-resource/TRANSFER/#{CGI.escape(wise_id)}"
   end
 
-  def wise_recipient_url
-    return nil unless wise_recipient_id.present?
-
-    "https://wise.com/recipients/#{CGI.escape(wise_recipient_id)}"
-  end
-
   def can_cancel?
     pending?
   end
@@ -318,20 +309,4 @@ def normalize_wise_id
     end
   end
 
-  WISE_RECIPIENT_ID_REGEXP = /wise\.com\/recipients\/([\h-]{36})/
-
-  def normalize_wise_recipient_id
-    return unless wise_recipient_id_changed? && wise_recipient_id.present?
-
-    normalized = wise_recipient_id.strip
-
-    if normalized =~ WISE_RECIPIENT_ID_FORMAT
-      self.wise_recipient_id = normalized
-      return
-    end
-
-    match = WISE_RECIPIENT_ID_REGEXP.match(normalized)
-    self.wise_recipient_id = match[1] if match
-  end
-
 end

app/tasks/maintenance/normalize_wise_recipient_ids_task.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Maintenance
+  # One-time cleanup: reimbursement approvals used to save the pasted Wise recipient URL
+  # (e.g. https://wise.com/recipients/<uuid>?new=undefined) onto the payout method as-is,
+  # which broke the "Open <name> on Wise" button. Reduces every stored value to the bare
+  # UUID, matching what `HasWiseRecipient#normalize_wise_recipient_id` does now.
+  # Run once after deploying.
+  class NormalizeWiseRecipientIdsTask < MaintenanceTasks::Task
+    def collection
+      LegalEntity::PayoutMethod::WiseTransfer.where.not(wise_recipient_id: nil).where.not("wise_recipient_id ~* ?", "^[0-9a-f-]{36}$")
+    end
+
+    def process(payout_method)
+      payout_method.wise_recipient_id_will_change!
+      payout_method.normalize_wise_recipient_id
+      payout_method.update_columns(wise_recipient_id: payout_method.wise_recipient_id) if payout_method.wise_recipient_id_changed?
+    end
+
+  end
+end

app/views/admin/wise_transfer_process.html.erb

@@ -203,7 +203,12 @@
             <%= form.text_field(
                   :wise_recipient_id,
                   class: "w-[400px]",
-                  placeholder: "https://wise.com/recipients/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                  placeholder: "https://wise.com/recipients/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                  data: {
+                    controller: "strip-prefix",
+                    action: "paste->strip-prefix#paste",
+                    strip_prefix_prefix_value: "https://wise.com/recipients/"
+                  }
                 ) %>
           </div>
 

app/views/reimbursement/reports/_actions.html.erb

@@ -344,8 +344,8 @@
                     </strong>
                   </div>
 
-                  <% if payout_method.wise_recipient_id.present? %>
-                    <%= link_to "https://wise.com/send#?contact=#{payout_method.wise_recipient_id}", class: "btn btn-small tooltipped tooltipped--w bg-[#9FE870] text-[#163300] flex-shrink-0", style: "color: #163300!important; background: #9FE870", target: "_blank", "aria-label": "Use recipient information from previous transfer" do %>
+                  <% if payout_method.wise_recipient_url %>
+                    <%= link_to payout_method.wise_recipient_url, class: "btn btn-small tooltipped tooltipped--w bg-[#9FE870] text-[#163300] flex-shrink-0", style: "color: #163300!important; background: #9FE870", target: "_blank", "aria-label": "Use recipient information from previous transfer" do %>
                       <%= inline_icon "wise" %>
                       Open <%= report.user.full_name %> on Wise
                     <% end %>

app/views/reimbursement/reports/show.html.erb

@@ -232,7 +232,12 @@
                 :wise_recipient_id,
                 style: "width: 400px;",
                 class: "mt-0 !max-w-full",
-                placeholder: "https://wise.com/recipients/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                placeholder: "https://wise.com/recipients/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                data: {
+                  controller: "strip-prefix",
+                  action: "paste->strip-prefix#paste",
+                  strip_prefix_prefix_value: "https://wise.com/recipients/"
+                }
               ) %>
         </div>
         <%= form.submit "Mark transfer as sent" %>

spec/models/wise_transfer_spec.rb

@@ -53,6 +53,11 @@ def build_instance(**attrs)
       instance.validate
       expect(instance.errors[:wise_id]).to be_empty
       expect(instance.wise_id).to eq("0987654321")
+
+      instance.wise_id = "https://wise.com/transactions/activities/by-resource/TRANSFER/1122334455?origin=activity-list"
+      instance.validate
+      expect(instance.errors[:wise_id]).to be_empty
+      expect(instance.wise_id).to eq("1122334455")
     end
   end
 

spec/tasks/maintenance/normalize_wise_recipient_ids_task_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Maintenance::NormalizeWiseRecipientIdsTask do
+  it "reduces a stored recipient URL to its UUID" do
+    payout_method = LegalEntity::PayoutMethod::WiseTransfer.new
+    payout_method.wise_recipient_id = "https://wise.com/recipients/86b41d15-1024-47ee-9e05-1891a912e450?new=undefined"
+    payout_method.clear_changes_information
+    allow(payout_method).to receive(:update_columns)
+
+    described_class.process(payout_method)
+
+    expect(payout_method).to have_received(:update_columns).with(wise_recipient_id: "86b41d15-1024-47ee-9e05-1891a912e450")
+  end
+end