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.

Sign up for GitHub

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

Jump to bottom

Merge improvements #3

Merged
merged 2 commits into from
May 23, 2024
Merged

Merge improvements #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f713de2
refactor: Add SkipButton component to App.tsx and TransactionButton.t…
daniel-vahn May 22, 2024
b91d91d
refactor: Update Avatar component to use max-w-full for image width
daniel-vahn May 23, 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
14 changes: 9 additions & 5 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ function App() {
>
<div className="flex justify-between">
<BackButton goBack={goBack} />
<SkipButton skip={skip} />
{connectionState === 'connected' && (
<SkipButton skip={skip} />
)}
Expand Down Expand Up @@ -279,11 +280,14 @@ function App() {
<div className="flex flex-col bg-white pt-4 px-8 pb-2 min-h-fit gap-2 rounded-t-3xl rounded-b-xl shadow-custom-white">
<h2 className="headline">HORRAY!</h2>
<div className="text-xs break-all font-semibold text-center text-customGrayAddress">
<p className="my-0 mx-auto">{account}</p>
<p className="my-0 mx-auto">
{account ||
'0xcccodoiuwqbqjßq21jruß2rß120j'}
</p>
</div>
<div className="flex justify-center items-center max-w-10 my-0 mx-auto">
<img
className="max-h-full max-w-full"
className="h-auto max-w-full"
src={etherIcon}
alt=""
/>
Expand Down Expand Up @@ -319,8 +323,8 @@ function App() {
</>
)}
{view === View.WALLET && (
<div>
<div className="h-screen bg-customGrayWallet">
<>
<div className="h-screen bg-customGrayWallet rounded-t-xl">
<BackButton goBack={goBack} />
<div className="flex flex-col gap-4 p-4">
<div className="flex flex-col">
Expand Down Expand Up @@ -388,7 +392,7 @@ function App() {
</div>
</div>
</div>
</div>
</>
)}
</div>
);
Expand Down
8 changes: 6 additions & 2 deletions src/components/utils/Avatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ type Props = {

const Avatar: React.FC<Props> = ({ src }) => {
return (
<div className="flex flex-grow items-center justify-center overflow-hidden max-h-96 py-4 px-8">
<img className="max-h-80 w-auto object-contain" src={src} alt="" />
<div className="flex flex-grow items-center justify-center overflow-hidden max-h-96 py-2 px-8">
<img
className="h-auto max-w-full object-contain"
src={src}
alt=""
/>
</div>
);
};
Expand Down