LaconicNetwork/mars-v2-frontend
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/mars-protocol/mars-v2-frontend into develop

Browse Source 
# Conflicts:
#	src/components/Icons/index.ts
#	src/components/Trade/TradeChart/TVChartContainer.tsx
#	src/components/Trade/TradeChart/index.tsx
#	src/components/common/Icons/PythLogoType.svg
#	src/components/common/Toaster/index.tsx
#	src/components/header/DesktopHeader.tsx
#	src/components/trade/TradeChart/PoweredByPyth.tsx
#	src/store/slices/broadcast.ts
This commit is contained in:
Linkie Link 2024-01-24 08:53:44 +01:00
commit 2997d7440e
No known key found for this signature in database
GPG Key ID: 5318B0F2564D38EA
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/common/Toaster/index.tsx
View File

@ -35,7 +35,6 @@ export function generateToastContent(content: ToastSuccess['content'], assets: A
<Text size='sm' className='w-full mb-1 text-white'>
{item.text}
</Text>
{item.coins.length > 0 && (
<ul className='flex flex-wrap w-full gap-1 p-1 pl-4 list-disc'>
{item.coins.map((coin, index) => {

1
src/types/interfaces/store/broadcast.d.ts vendored
View File

@ -15,6 +15,7 @@ interface ToastObjectOptions extends HandleResponseProps {
interface ToastObject {
response: Promise<BroadcastResult>
options: ToastObjectOptions
swapOptions?: {
coinIn: BNCoin
denomOut: string