[DO NOT MERGE] Test auth stg

.github/workflows/pr.yaml

@@ -114,7 +114,7 @@ jobs:
           VITE_TAG: ${{ needs.prepare.outputs.image_tag }}
           CURRENT_BRANCH: ${{ needs.prepare.outputs.current_branch }}
           NODE_OPTIONS: '--max_old_space_size=4096'
-        run: yarn build
+        run: yarn build-stg
 
       - name: Docker build and push
         uses: docker/build-push-action@v2

src/components/Announcement/PrivateAnnoucement/InboxItemLO.tsx

@@ -1,6 +1,6 @@
 import { ChainId } from '@kyberswap/ks-sdk-core'
 import { t } from '@lingui/macro'
-import { Repeat } from 'react-feather'
+import { Repeat, XCircle } from 'react-feather'
 import { useNavigate } from 'react-router-dom'
 
 import { PrivateAnnouncementProp } from 'components/Announcement/PrivateAnnoucement'
@@ -18,6 +18,7 @@ import { CheckCircle } from 'components/Icons'
 import DeltaTokenAmount from 'components/WalletPopup/Transactions/DeltaTokenAmount'
 import { LimitOrderStatus } from 'components/swapv2/LimitOrder/type'
 import { APP_PATHS } from 'constants/index'
+import { NETWORKS_INFO } from 'constants/networks'
 import useTheme from 'hooks/useTheme'
 
 function InboxItemBridge({
@@ -44,18 +45,22 @@ function InboxItemBridge({
     takingAmountRate,
     chainId: rawChainId,
   } = templateBody?.order || {}
+  const isReorg = templateBody.isReorg
+
   const isFilled = status === LimitOrderStatus.FILLED
   const isPartialFilled = status === LimitOrderStatus.PARTIALLY_FILLED
   const chainId = rawChainId && rawChainId !== '{{.chainId}}' ? (Number(rawChainId) as ChainId) : undefined
-  const statusMessage = isFilled
+  const statusMessage = isReorg
+    ? t`Reverted ${increasedFilledPercent}`
+    : isFilled
     ? t`100% Filled`
     : isPartialFilled
     ? t`${filledPercent} Filled ${increasedFilledPercent}`
     : `${filledPercent}% Filled | Expired`
 
   const navigate = useNavigate()
   const onClick = () => {
-    navigate(APP_PATHS.LIMIT)
+    navigate(`${APP_PATHS.LIMIT}/${NETWORKS_INFO[+templateBody.order.chainId as ChainId]?.route}`)
     onRead(announcement, statusMessage)
   }
 
@@ -68,11 +73,13 @@ function InboxItemBridge({
           {!isRead && <Dot />}
         </RowItem>
         <RowItem>
-          <PrimaryText>{statusMessage}</PrimaryText>
+          <PrimaryText color={isReorg ? theme.red : undefined}>{statusMessage}</PrimaryText>
           {isFilled ? (
             <CheckCircle color={theme.primary} />
           ) : isPartialFilled ? (
             <Repeat color={theme.warning} size={12} />
+          ) : isReorg ? (
+            <XCircle color={theme.red} size={12} />
           ) : (
             <CheckCircle color={theme.warning} />
           )}
@@ -87,7 +94,7 @@ function InboxItemBridge({
           logoURL={takerAssetLogoURL}
         />
         <PrimaryText>
-          {takingAmountRate} {makerAssetSymbol}/{takerAssetSymbol}
+          {takingAmountRate} {takerAssetSymbol}/{makerAssetSymbol}
         </PrimaryText>
       </InboxItemRow>
 

src/components/Announcement/PrivateAnnoucement/NotificationCenter/LimitOrder.tsx

@@ -9,6 +9,7 @@ import { AnnouncementTemplateLimitOrder } from 'components/Announcement/type'
 import Logo from 'components/Logo'
 import { LimitOrderStatus } from 'components/swapv2/LimitOrder/type'
 import { APP_PATHS } from 'constants/index'
+import { NETWORKS_INFO } from 'constants/networks'
 import useTheme from 'hooks/useTheme'
 import { formatTime } from 'utils/time'
 
@@ -33,15 +34,21 @@ export default function AnnouncementItem({
     takingAmount,
     takingAmountRate,
     filledPercent,
+    increasedFilledPercent,
     chainId: rawChainId,
     takerAssetLogoURL,
   } = templateBody?.order || {}
+  const isReorg = templateBody.isReorg
   const isFilled = status === LimitOrderStatus.FILLED
   const isPartialFilled = status === LimitOrderStatus.PARTIALLY_FILLED
   const chainId = rawChainId && rawChainId !== '{{.chainId}}' ? (Number(rawChainId) as ChainId) : undefined
   const theme = useTheme()
 
-  const statusMessage = isFilled ? (
+  const statusMessage = isReorg ? (
+    <Text as="span" color={theme.red}>
+      reverted {increasedFilledPercent}
+    </Text>
+  ) : isFilled ? (
     <Text as="span" color={theme.primary}>
       successfully filled
     </Text>
@@ -57,7 +64,7 @@ export default function AnnouncementItem({
 
   const navigate = useNavigate()
   return (
-    <Wrapper onClick={() => navigate(APP_PATHS.LIMIT)}>
+    <Wrapper onClick={() => navigate(`${APP_PATHS.LIMIT}/${NETWORKS_INFO[chainId || ChainId.MAINNET].route}`)}>
       <Flex justifyContent="space-between" width="100%">
         <Title>
           <InboxIcon type={templateType} chainId={chainId} />

src/components/Announcement/type.ts

@@ -67,6 +67,7 @@ type PoolPositionAnnouncement = {
 export type AnnouncementTemplateLimitOrder = {
   order: LimitOrderAnnouncement
   popupType: PopupType
+  isReorg: boolean
 }
 export type AnnouncementTemplateCrossChain = { transaction: CrossChainTransfer; popupType: PopupType }
 export type AnnouncementTemplateBridge = { transaction: MultichainTransfer; popupType: PopupType }

src/constants/env.ts

@@ -124,21 +124,21 @@ const ANNOUNCEMENT_TEMPLATE_IDS: { [key in EnvKeys]: TemplateConfig } = {
   },
   staging: {
     [PrivateAnnouncementType.PRICE_ALERT]: '30',
-    [PrivateAnnouncementType.LIMIT_ORDER]: '14,15,16,17',
+    [PrivateAnnouncementType.LIMIT_ORDER]: '14,15,16,17,31',
     [PrivateAnnouncementType.BRIDGE_ASSET]: '12,13',
     [PrivateAnnouncementType.CROSS_CHAIN]: '25,26',
     [PrivateAnnouncementType.ELASTIC_POOLS]: '20,21',
     [PrivateAnnouncementType.DIRECT_MESSAGE]: '',
-    EXCLUDE: '2,11,1,28,29,22,23',
+    EXCLUDE: '2,11,1,28,29,22,23,27',
   },
   production: {
     [PrivateAnnouncementType.PRICE_ALERT]: '29',
-    [PrivateAnnouncementType.LIMIT_ORDER]: '12,13,14,15',
+    [PrivateAnnouncementType.LIMIT_ORDER]: '12,13,14,15,31',
     [PrivateAnnouncementType.BRIDGE_ASSET]: '10,11',
     [PrivateAnnouncementType.CROSS_CHAIN]: '27,28',
     [PrivateAnnouncementType.ELASTIC_POOLS]: '17,18',
     [PrivateAnnouncementType.DIRECT_MESSAGE]: '',
-    EXCLUDE: '2,16,19,9,25,24,21,22',
+    EXCLUDE: '2,16,19,9,25,24,21,22,25,26,30',
   },
 }