From 695f2d9221ebff538d8a1eb1a6458f98ee797272 Mon Sep 17 00:00:00 2001
From: Krishna Iyer Easwaran <krishna@thethingsindustries.com>
Date: Mon, 10 Jul 2023 14:46:42 +0200
Subject: [PATCH] console: Move EUI transformation to SDK

---
 pkg/webui/console/views/device-general-settings/index.js | 3 +--
 sdk/js/src/service/claim.js                              | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/webui/console/views/device-general-settings/index.js b/pkg/webui/console/views/device-general-settings/index.js
index a34ed6d0216..a740c01d86f 100644
--- a/pkg/webui/console/views/device-general-settings/index.js
+++ b/pkg/webui/console/views/device-general-settings/index.js
@@ -36,7 +36,6 @@ import {
   selectNsConfig,
 } from '@ttn-lw/lib/selectors/env'
 
-import { hexToBase64 } from '@console/lib/bytes'
 import {
   mayEditApplicationDeviceKeys,
   mayReadApplicationDeviceKeys,
@@ -102,7 +101,7 @@ const DeviceGeneralSettings = () => {
       ids: { dev_eui: devEui, join_eui: joinEui },
     } = device
     await dispatch(
-      attachPromise(unclaimDevice(appId, devId, hexToBase64(devEui), hexToBase64(joinEui))),
+      attachPromise(unclaimDevice(appId, devId, devEui, joinEui)),
     )
   }, [appId, devId, device, dispatch])
 
diff --git a/sdk/js/src/service/claim.js b/sdk/js/src/service/claim.js
index 2340ac9cd62..3cee87342bf 100644
--- a/sdk/js/src/service/claim.js
+++ b/sdk/js/src/service/claim.js
@@ -16,6 +16,8 @@ import autoBind from 'auto-bind'
 
 import Marshaler from '../util/marshaler'
 
+import { hexToBase64 } from '@console/lib/bytes'
+
 class DeviceClaim {
   constructor(registry, { stackConfig }) {
     this._api = registry
@@ -62,8 +64,8 @@ class DeviceClaim {
     }
 
     const response = await this._api.EndDeviceClaimingServer.Unclaim(params, {
-      dev_eui: devEui,
-      join_eui: joinEui,
+      dev_eui: hexToBase64(devEui),
+      join_eui: hexToBase64(joinEui),
     })
 
     return Marshaler.payloadSingleResponse(response)