From 98a3a6979fdd415335d68acfc6ebf32a0e1dd007 Mon Sep 17 00:00:00 2001
From: abtestingalpha <104046418+abtestingalpha@users.noreply.github.com>
Date: Sun, 20 Oct 2024 15:38:09 -0400
Subject: [PATCH] /destinationTokens returns empty list when bridgeable token
 isnt in bridgemap with destinations (#3314)

---
 .../src/controllers/destinationTokensController.ts | 14 ++++++++++----
 .../src/tests/destinationTokensRoute.test.ts       | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/rest-api/src/controllers/destinationTokensController.ts b/packages/rest-api/src/controllers/destinationTokensController.ts
index 2947901925..8bdffff61a 100644
--- a/packages/rest-api/src/controllers/destinationTokensController.ts
+++ b/packages/rest-api/src/controllers/destinationTokensController.ts
@@ -10,28 +10,34 @@ export const destinationTokensController = async (req, res) => {
     return res.status(400).json({ errors: errors.array() })
   }
 
+  let payload
+
   try {
     const { fromChain, fromToken } = req.query
 
     const fromTokenInfo = tokenAddressToToken(fromChain.toString(), fromToken)
 
-    const constructedKey = `${fromTokenInfo.symbol}-${fromChain}`
+    if (!fromTokenInfo) {
+      payload = []
+    } else {
+      const constructedKey = `${fromTokenInfo.symbol}-${fromChain}`
 
-    const payload = BRIDGE_ROUTE_MAPPING[constructedKey]
+      payload = BRIDGE_ROUTE_MAPPING[constructedKey]
+    }
 
     logger.info(`Successful destinationTokensController response`, {
       query: req.query,
       payload,
     })
 
-    res.json(payload)
+    return res.json(payload)
   } catch (err) {
     logger.error(`Error in destinationTokensController`, {
       query: req.query,
       error: err.message,
       stack: err.stack,
     })
-    res.status(500).json({
+    return res.status(500).json({
       error:
         'An unexpected error occurred in /destinationTokens. Please try again later.',
     })
diff --git a/packages/rest-api/src/tests/destinationTokensRoute.test.ts b/packages/rest-api/src/tests/destinationTokensRoute.test.ts
index a083741ffa..3cb0c8e217 100644
--- a/packages/rest-api/src/tests/destinationTokensRoute.test.ts
+++ b/packages/rest-api/src/tests/destinationTokensRoute.test.ts
@@ -3,7 +3,7 @@ import express from 'express'
 
 import destinationTokensRoute from '../routes/destinationTokensRoute'
 import { NativeGasAddress, ZeroAddress } from '../constants'
-import { USDC, USDT } from '../constants/bridgeable'
+import { ONEETH, USDC, USDT } from '../constants/bridgeable'
 
 const app = express()
 app.use('/destinationTokens', destinationTokensRoute)
@@ -81,6 +81,17 @@ describe('destinatonTokens Route', () => {
     expect(response.body[0]).toHaveProperty('chainId')
   })
 
+  it('should return empty list if there are no destinations', async () => {
+    const response = await request(app).get('/destinationTokens').query({
+      fromChain: '1666600000',
+      fromToken: ONEETH.addresses[1666600000].toLowerCase(),
+    })
+
+    expect(response.status).toBe(200)
+    expect(Array.isArray(response.body)).toBe(true)
+    expect(response.body.length).toEqual(0)
+  })
+
   it('should return 400 for unsupported fromChain', async () => {
     const response = await request(app).get('/destinationTokens').query({
       fromChain: '999',