resolve conflict

KyberNetwork · Jun 9, 2023 · cef25d7 · cef25d7
1 parent 4ea5b60
commit cef25d7
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/components/LiveChart/index.tsx b/src/components/LiveChart/index.tsx
@@ -323,20 +323,20 @@ function LiveChart({
               </Flex>
             </Flex>
 
-          {/* Stop tradingview from rerender on isShowProChart change */}
-          <div style={{ display: isShowProChart && !!poolAddress ? 'block' : 'none', height: '100%' }}>
-            {commonPool && <TradingViewChart poolDetail={commonPool} isReverse={isReverse} label={label} />}
-            <Flex justifyContent="flex-end" sx={{ gap: '0.5rem', marginTop: '6px' }}>
-              <Text color={theme.subText} fontSize="10px">
-                Powered by
-              </Text>
-              {isDarkMode ? (
-                <GeckoTerminalSVG style={{ width: '75px' }} />
-              ) : (
-                <GeckoTerminalLightSVG style={{ width: '75px' }} />
-              )}
-            </Flex>
-          </div>
+            {/* Stop tradingview from rerender on isShowProChart change */}
+            <div style={{ display: isShowProChart && !!poolAddress ? 'block' : 'none', height: '100%' }}>
+              {commonPool && <TradingViewChart poolDetail={commonPool} isReverse={isReverse} label={label} />}
+              <Flex justifyContent="flex-end" sx={{ gap: '0.5rem', marginTop: '6px' }}>
+                <Text color={theme.subText} fontSize="10px">
+                  Powered by
+                </Text>
+                {isDarkMode ? (
+                  <GeckoTerminalSVG style={{ width: '75px' }} />
+                ) : (
+                  <GeckoTerminalLightSVG style={{ width: '75px' }} />
+                )}
+              </Flex>
+            </div>
 
             {!isShowProChart && (
               <>