Merge branch 'main' of https://github.com/Uniswap/v3-interface into main

src/components/Header/index.tsx

@@ -340,7 +340,7 @@ export default function Header() {
             Boolean(match) ||
             pathname.startsWith('/add') ||
             pathname.startsWith('/remove') ||
-            pathname.startsWith('/create') ||
+            pathname.startsWith('/increase') ||
             pathname.startsWith('/find')
           }
         >
@@ -370,7 +370,6 @@ export default function Header() {
               <CardNoise />
             </UNIWrapper>
           )}
-
           <AccountElement active={!!account} style={{ pointerEvents: 'auto' }}>
             {account && userEthBalance ? (
               <BalanceText style={{ flexShrink: 0 }} pl="0.75rem" pr="0.5rem" fontWeight={500}>

src/components/InputStepCounter/InputStepCounter.tsx

@@ -145,10 +145,10 @@ const StepCounter = ({
       {!locked ? (
         <RowBetween>
           <SmallButton onClick={handleDecrement}>
-            <TYPE.black fontSize="12px">-{feeAmountFormatted}%</TYPE.black>
+            <TYPE.white fontSize="12px">-{feeAmountFormatted}%</TYPE.white>
           </SmallButton>
           <SmallButton onClick={handleIncrement}>
-            <TYPE.black fontSize="12px">+{feeAmountFormatted}%</TYPE.black>
+            <TYPE.white fontSize="12px">+{feeAmountFormatted}%</TYPE.white>
           </SmallButton>
         </RowBetween>
       ) : null}

src/components/Menu/index.tsx

@@ -90,7 +90,10 @@ const MenuFlyout = styled.span<{ flyoutAlignment?: FlyoutAlignment }>`
 `
 
 const MenuItem = styled(ExternalLink)`
+  display: flex;
   flex: 1;
+  flex-direction: row;
+  align-items: center;
   padding: 0.5rem 0.5rem;
   color: ${({ theme }) => theme.text2};
   :hover {
@@ -139,23 +142,23 @@ export default function Menu() {
         <MenuFlyout>
           <MenuItem href="https://uniswap.org/">
             <Info size={14} />
-            About
+            <div>About</div>
           </MenuItem>
           <MenuItem href="https://docs.uniswap.org/">
             <BookOpen size={14} />
-            Docs
+            <div>Docs</div>
           </MenuItem>
           <MenuItem href={CODE_LINK}>
             <Code size={14} />
-            Code
+            <div>Code</div>
           </MenuItem>
           <MenuItem href="https://discord.gg/FCfyBSbCU5">
             <MessageCircle size={14} />
-            Discord
+            <div>Discord</div>
           </MenuItem>
           <MenuItem href="https://info.uniswap.org/">
             <PieChart size={14} />
-            Analytics
+            <div>Analytics</div>
           </MenuItem>
           {account && (
             <UNIbutton onClick={openClaimModal} padding="8px 16px" width="100%" borderRadius="12px" mt="0.5rem">

src/state/user/reducer.test.ts

@@ -27,7 +27,7 @@ describe('swap reducer', () => {
       } as any)
       store.dispatch(updateVersion())
       expect(store.getState().userDeadline).toEqual(DEFAULT_DEADLINE_FROM_NOW)
-      expect(store.getState().userSlippageTolerance).toEqual(50)
+      expect(store.getState().userSlippageTolerance).toEqual(10)
     })
   })
 })