Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚧✨On Ramp integration #455

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3c479f2
🚧Add Buy page
MattPoblete Jun 4, 2024
3eaf3c3
🚧Display change active chain menu in all wallets
MattPoblete Jun 4, 2024
c75a114
💄Fix connect wallet button height
MattPoblete Jun 4, 2024
9e49ac7
🐛Visual bugs fixed
MattPoblete Jun 5, 2024
b0edb5e
🔥Removed unused console.log
MattPoblete Jun 5, 2024
6f19d55
🚧Created buy crypto panel
MattPoblete Jun 5, 2024
bd94a84
✨Add on-ramp helper functions
MattPoblete Jun 6, 2024
249c0d2
🚧Add on-ramp dev function
MattPoblete Jun 6, 2024
2fc89f9
🚧Add types & fix build issues
MattPoblete Jun 7, 2024
f9a16c7
♻️add get currencies from toml file
MattPoblete Jun 10, 2024
a87c52f
♻️Refactor buy component
MattPoblete Jun 10, 2024
bf72598
♻️Refactor swapHeader
MattPoblete Jun 10, 2024
fe100b2
♻️Improve trustline flow + add new anchors
MattPoblete Jun 10, 2024
052371a
Merge branch 'main' of https://github.com/soroswap/frontend into dev/…
MattPoblete Jun 24, 2024
7395a60
🩹Fix Button behaviour
MattPoblete Jun 25, 2024
c8f6661
✨Created modal for selection in buy section
MattPoblete Jun 25, 2024
27c2251
♻️Refactor BuyComponent to add modal behaviour
MattPoblete Jun 25, 2024
da4fcfa
✨Add deposit status modal
MattPoblete Jun 26, 2024
d1db596
✨Add events listening to interactive deposit
MattPoblete Jun 26, 2024
9bd5adf
♻️ Remove console.log statements and add error handling in SEP-1 func…
MattPoblete Jul 8, 2024
5e5f4eb
Merge branch 'main' of https://github.com/soroswap/frontend into dev/…
MattPoblete Jul 8, 2024
36a8fad
🚧Merge to main
MattPoblete Jul 8, 2024
ab389e1
Merge branch 'main' of https://github.com/soroswap/frontend into dev/…
MattPoblete Jul 18, 2024
f6b8d74
Merge branch 'main' of https://github.com/soroswap/frontend into dev/…
MattPoblete Aug 5, 2024
5d02613
🚧Fix display bugs
MattPoblete Aug 15, 2024
5c34d39
🚧improving styles
MattPoblete Aug 19, 2024
de4d081
Merge branch 'main' of https://github.com/soroswap/frontend into dev/…
MattPoblete Aug 22, 2024
007e182
💄Improved UI in buy section
MattPoblete Aug 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
🚧Display change active chain menu in all wallets
  • Loading branch information
MattPoblete committed Jun 4, 2024
commit 3eaf3c38f1208aab117ec8fad9ebfcbfaabed68f
22 changes: 11 additions & 11 deletions src/components/Layout/ProfileSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,9 @@ export const HeaderChip = ({
display: 'flex',
flexDirection: 'row',
height: isSmall ? 30 : 56,
padding: isSmall && canDisconnect ? '8px 1px 16px 1px' : isSmall ? '8px 16px' : '16px 24px',
width: isSmall ? 100 : 200,
paddingRight: '16px',
justifyContent: 'center',
alignItems: 'center',
gap: 0.5,
flexShrink: 0,
borderRadius: isSmall ? '4px' : '16px',
backgroundColor: '#8866DD',
Expand All @@ -124,15 +123,15 @@ export const HeaderChip = ({
fontFamily: 'Inter',
fontWeight: 600,
lineHeight: '140%',
padding: 0
padding: '0px'
},
':hover': {
backgroundColor: '#8866DD',
},
'.MuiChip-action-icon':{
position:'relative',
top: isSmall ? '7px' :'5px',
left: '5px'
position: 'absolute',
marginLeft: '2px',
marginTop: '2px',
}
}
return (
Expand Down Expand Up @@ -203,14 +202,15 @@ export const HeaderChip = ({
export const ActiveChainHeaderChip = ({ isMobile }: { isMobile?: boolean }) => {
const sorobanContext: SorobanContextType = useSorobanReact();
const { activeChain, chains, activeConnector, address} = sorobanContext;

console.log(activeChain)
return (
<>
{activeChain && chains && activeConnector?.id == 'xbull' && address ?
{/* {activeChain && chains && activeConnector?.id == 'xbull' && address ?
<HeaderChip label={[activeChain?.name, <ArrowDropDownSharp key={'action-icon'} className='MuiChip-action-icon'/>]} isSmall={isMobile} chains={chains}/>
:
:
<HeaderChip label={activeChain?.name} isSmall={isMobile}/>
}
} */}
<HeaderChip label={[activeChain?.name, <ArrowDropDownSharp key={'action-icon'} className='MuiChip-action-icon' />]} isSmall={isMobile} chains={chains} />
</>
);
};
Expand Down