Skip to content

Commit

Permalink
Merge pull request #594 from LimeChain/develop
Browse files Browse the repository at this point in the history
Develop to Main
  • Loading branch information
RAMTO authored Apr 26, 2023
2 parents 083c7af + 1077ddd commit 0a6ce27
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/firebase-hosting-merge-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
echo "REACT_APP_WHBAR_ADDRESS=0x00000000000000000000000000000000000F7e89" >> $GITHUB_ENV
echo "REACT_APP_LOCKDROP_ADDRESS=0x00000000000000000000000000000000001D917d" >> $GITHUB_ENV
echo "REACT_APP_HELI_TOKEN_ADDRESS=0x00000000000000000000000000000000001d90C9" >> $GITHUB_ENV
echo "REACT_APP_SINGLE_SIDED_STAKING_ADDRESS=0x0000000000000000000000000000000000213B39" >> $GITHUB_ENV
echo "REACT_APP_SINGLE_SIDED_STAKING_ADDRESS=0x0000000000000000000000000000000000214949" >> $GITHUB_ENV
- name: Build
run: yarn install --frozen-lockfile && yarn run build
- uses: FirebaseExtended/action-hosting-deploy@v0
Expand Down
10 changes: 7 additions & 3 deletions src/components/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const navigation = [
link: '/buy-crypto',
name: 'c14',
color: 'gray',
text: 'Buy crypto with Fiat',
text: 'Buy Crypto with Fiat',
},
{
link: '/analytics',
Expand Down Expand Up @@ -74,7 +74,7 @@ const Navigation = () => {
to={item.link}
className={({ isActive }) => getClasses(isActive, index).join(' ')}
>
<Tippy placement="right" className="d-xxxl-none" content={item.text}>
<Tippy placement="right" className="d-none d-md-block d-xxxl-none" content={item.text}>
<span className="icon-menu">
<Icon color={item.color} name={item.name} />
</span>
Expand All @@ -89,7 +89,11 @@ const Navigation = () => {
rel="noreferrer"
href="https://app.hashport.network/"
>
<Tippy placement="right" className="d-xxxl-none" content="Hashport Bridge">
<Tippy
placement="right"
className="d-none d-md-block d-xxxl-none"
content="Hashport Bridge"
>
<span className="icon-menu">
<Icon color="gray" name="hashport" />
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/SSSFAQ.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const SSSFAQ = () => {

<ExpandContent title="How long will Phase 1 go?">
<p className="text-small">
Phase 1 is intended to last a few weeks from today (April 25th) until Phase 2 has been
Phase 1 is intended to last a few weeks from today (April 26th) until Phase 2 has been
rolled out. Once we have more clarity on the launch date for Phase 2, we will update
the entire community in advance.
</p>
Expand Down

0 comments on commit 0a6ce27

Please sign in to comment.