Merge branch '1.12.2' into pair-notifs-ui

# Conflicts:
#	LightlessSync/UI/SettingsUi.cs
This commit is contained in:
choco
2025-10-11 21:42:14 +02:00
23 changed files with 1738 additions and 453 deletions

View File

@@ -462,7 +462,7 @@ public class TopTabMenu
try
{
var myCidHash = (await _dalamudUtilService.GetCIDAsync().ConfigureAwait(false)).ToString().GetHash256();
await _apiController.TryPairWithContentId(request.HashedCid, myCidHash).ConfigureAwait(false);
await _apiController.TryPairWithContentId(request.HashedCid).ConfigureAwait(false);
_pairRequestService.RemoveRequest(request.HashedCid);
var display = string.IsNullOrEmpty(request.DisplayName) ? request.HashedCid : request.DisplayName;