Merge branch 'staging' into entry-page

Author: mvadari

.github/dependabot.yml

@@ -3,6 +3,6 @@ updates:
   - package-ecosystem: npm
     directory: '/'
     schedule:
-      interval: monthly
+      interval: quarterly
       time: '15:00'
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 30

src/containers/Token/MPT/Header/index.tsx

@@ -8,6 +8,7 @@ import {
   shortenDomain,
   shortenMPTID,
   stripHttpProtocol,
+  convertToHttpURL,
 } from '../../../shared/utils'
 import { CopyableText } from '../../../shared/components/CopyableText'
 import DomainLink from '../../../shared/components/DomainLink'
@@ -102,6 +103,9 @@ export const Header = (props: Props) => {
   // Only show MPT issuance ID if ticker exists (since we show ticker in header, need to show ID somewhere)
   const showMPTIssuanceId = !!ticker
 
+  // Convert logo URL to HTTP/HTTPS format (handles IPFS URLs)
+  const RenderedLogoUrl = logoUrl ? convertToHttpURL(logoUrl) : undefined
+
   // Get all URIs for dropdown, filtering out items without uri
   const allUris = (uris || []).filter((u) => u.uri)
 
@@ -137,11 +141,11 @@ export const Header = (props: Props) => {
       </div>
       <div className="section box-header">
         <div className="token-info-group">
-          {logoUrl ? (
+          {RenderedLogoUrl ? (
             <img
               className="token-logo"
               alt={`${ticker || mptIssuanceId} logo`}
-              src={logoUrl}
+              src={RenderedLogoUrl}
             />
           ) : (
             <DefaultTokenIcon className="token-logo no-logo" />

src/containers/Token/MPT/test/Header/Header.test.tsx

@@ -115,6 +115,21 @@ describe('MPT Header component', () => {
     wrapper.unmount()
   })
 
+  it('displays logo URL without protocol by prefixing https', () => {
+    const dataWithNoProtocolUrl = {
+      ...mockMPTData,
+      parsedMPTMetadata: {
+        ...mockMPTData.parsedMPTMetadata,
+        icon: 'example.com/logo.png',
+      },
+    }
+    const wrapper = createWrapper({ data: dataWithNoProtocolUrl })
+    const logo = wrapper.find('img.token-logo')
+    expect(logo.length).toBe(1)
+    expect(logo.prop('src')).toBe('https://example.com/logo.png')
+    wrapper.unmount()
+  })
+
   it('displays default logo when no icon', () => {
     const wrapper = createWrapper({ data: mockMPTDataNoMetadata })
     expect(wrapper.find('.token-logo.no-logo').length).toBeGreaterThanOrEqual(1)

src/containers/shared/test/utils.test.ts

@@ -13,6 +13,7 @@ import {
   shortenNFTTokenID,
   shortenMPTID,
   stripHttpProtocol,
+  convertToHttpURL,
 } from '../utils'
 
 describe('utils', () => {
@@ -271,4 +272,38 @@ describe('Shorten utils', () => {
       expect(shortenMPTID(shortMPTID)).toBe(shortMPTID)
     })
   })
+
+  describe('convertToHttpUrl', () => {
+    it('converts IPFS URLs to HTTP URLs', () => {
+      expect(
+        convertToHttpURL(
+          'ipfs://QmXhvvWs3HaFkJvDuYvanj2pv31yFQGJewfEhfme1Sv47Y',
+        ),
+      ).toBe(
+        'https://ipfs.io/ipfs/QmXhvvWs3HaFkJvDuYvanj2pv31yFQGJewfEhfme1Sv47Y',
+      )
+    })
+
+    it('preserves https:// URLs as-is', () => {
+      expect(convertToHttpURL('https://example.com/logo.png')).toBe(
+        'https://example.com/logo.png',
+      )
+    })
+
+    it('adds https:// to plain domain URLs', () => {
+      expect(convertToHttpURL('logo.svgcdn.com/logos/openai-icon.png')).toBe(
+        'https://logo.svgcdn.com/logos/openai-icon.png',
+      )
+    })
+
+    it('handles empty strings', () => {
+      expect(convertToHttpURL('')).toBe('')
+    })
+
+    it('handles other protocols', () => {
+      expect(convertToHttpURL('ftp://example.com/file.txt')).toBe(
+        'ftp://example.com/file.txt',
+      )
+    })
+  })
 })

src/containers/shared/utils.js

@@ -557,3 +557,30 @@ export const shortenMPTID = (
 
 export const shortenTxHash = (txHash = '') =>
   txHash.length > 12 ? `${txHash.slice(0, 6)}...${txHash.slice(-6)}` : txHash
+
+/**
+ * Converts URLs to HTTP/HTTPS format, handling IPFS URLs and plain domains
+ * @param {string} url - The URL to convert (can be ipfs://, https://, http://, or plain domain)
+ * @returns {string} The converted HTTP/HTTPS URL
+ */
+export const convertToHttpURL = (url) => {
+  if (!url) {
+    return url
+  }
+
+  // Handle IPFS URLs - convert to HTTP
+  if (url.startsWith('ipfs://')) {
+    return url.replace('ipfs://', 'https://ipfs.io/ipfs/')
+  }
+
+  // Matches a protocol (e.g. 'http://' or 'https://') at the start of a string
+  const PROTOCOL_REGEX = /^([a-z][a-z0-9+\-.]*):\/\//
+
+  // If URL already has a protocol, return as is
+  if (PROTOCOL_REGEX.test(url)) {
+    return url
+  }
+
+  // Otherwise, assume it's a plain domain and add https://
+  return `https://${url}`
+}

src/rippled/accountTransactions.ts

@@ -17,7 +17,7 @@ export interface AccountTransactionsResult {
   marker?: any
 }
 
-const getAccountTransactions = (
+const getAccountTransactions = async (
   account: string,
   currency: string | undefined,
   marker: any,
@@ -62,35 +62,39 @@ const getAccountTransactions = (
   }
 
   log.info(`get transactions: ${account} -> ${classicAddress}`)
-  return getAccountTxs(rippledSocket, classicAddress, limit, marker)
-    .then((data) => {
-      const transactions = data.transactions
-        .map((tx: any) => {
-          const txn = formatTransaction(tx)
-          return summarize(txn, true)
-        })
-        .filter((tx: any) => {
-          // No filter - return all transactions
-          if (!currency) {
-            return true
-          }
+  try {
+    const data = await getAccountTxs(
+      rippledSocket,
+      classicAddress,
+      limit,
+      marker,
+    )
+    const transactions = data.transactions
+      .map((tx: any) => {
+        const txn = formatTransaction(tx)
+        return summarize(txn, true)
+      })
+      .filter((tx: any) => {
+        // No filter - return all transactions
+        if (!currency) {
+          return true
+        }
 
-          // Filter by currency (IOU) or MPT issuance ID (passed as currency)
-          const txString = JSON.stringify(tx)
-          return (
-            txString.includes(`"currency":"${currency.toUpperCase()}"`) ||
-            txString.includes(`"${currency}"`)
-          )
-        })
-      return {
-        transactions,
-        marker: data.marker,
-      }
-    })
-    .catch((error: any) => {
-      log.error(error.toString())
-      throw error
-    })
+        // Filter by currency (IOU) or MPT issuance ID (passed as currency)
+        const txString = JSON.stringify(tx)
+        return (
+          txString.includes(`"currency":"${currency.toUpperCase()}"`) ||
+          txString.includes(`"${currency}"`)
+        )
+      })
+    return {
+      transactions,
+      marker: data.marker,
+    }
+  } catch (error: any) {
+    log.error(error.toString())
+    throw error
+  }
 }
 
 export default getAccountTransactions

src/rippled/index.ts

@@ -1,19 +1,9 @@
-import getAccountState from './accountState'
-import getAccountTransactions from './accountTransactions'
-import getLedger from './ledgers'
-import getTransaction from './transactions'
-import getQuorum from './quorum'
-import getNegativeUNL from './nUNL'
-import getOffers from './offers'
-
-export {
-  getAccountState,
-  getAccountTransactions,
-  getLedger,
-  getTransaction,
-  getQuorum,
-  getNegativeUNL,
-  getOffers,
-}
+export { default as getAccountState } from './accountState'
+export { default as getAccountTransactions } from './accountTransactions'
+export { default as getLedger } from './ledgers'
+export { default as getTransaction } from './transactions'
+export { default as getQuorum } from './quorum'
+export { default as getNegativeUNL } from './nUNL'
+export { default as getOffers } from './offers'
 
 export { getAccountInfo, getAMMInfoByAssets } from './lib/rippled'

src/rippled/ledgers.ts

@@ -5,10 +5,10 @@ import type { ExplorerXrplClient } from '../containers/shared/SocketContext'
 
 const log = logger({ name: 'ledgers' })
 
-const getLedger = (
+const getLedger = async (
   identifier: string | number,
   rippledSocket: ExplorerXrplClient,
-) => {
+): Promise<any> => {
   const parameters: any = {}
   if (!isNaN(Number(identifier))) {
     parameters.ledger_index = Number(identifier)
@@ -22,13 +22,13 @@ const getLedger = (
   }
 
   log.info(`get ledger: ${JSON.stringify(parameters)}`)
-  return getRippledLedger(rippledSocket, parameters)
-    .then((ledger) => summarizeLedger(ledger, true))
-    .then((data) => data)
-    .catch((error: any) => {
-      log.error(error.toString())
-      throw error
-    })
+  try {
+    const ledger = await getRippledLedger(rippledSocket, parameters)
+    return summarizeLedger(ledger, true)
+  } catch (error: any) {
+    log.error(error.toString())
+    throw error
+  }
 }
 
 export default getLedger