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

fix(history): Min-ada + section 1st row #2992

Merged
merged 1 commit into from
Jan 12, 2024
Merged

fix(history): Min-ada + section 1st row #2992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion apps/wallet-mobile/src/TxHistory/TxHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {ActionsBanner} from './ActionsBanner'
import {AssetList} from './AssetList'
import {BalanceBanner} from './BalanceBanner'
import {CollapsibleHeader} from './CollapsibleHeader'
import {LockedDeposit} from './LockedDeposit'
import {TxHistoryList} from './TxHistoryList'
import {useAnimatedTxHistory} from './useAnimatedTxHistory'
import {useOnScroll} from './useOnScroll'
Expand Down Expand Up @@ -85,7 +86,9 @@ export const TxHistory = () => {
</Tabs>

<TabPanels>
<Spacer height={4} />
<Spacer height={2} />

<LockedDeposit />

<Spacer height={8} />

Expand Down
4 changes: 2 additions & 2 deletions apps/wallet-mobile/src/TxHistory/TxHistoryList/TxHistoryList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const TxHistoryList = (props: Props) => {
ItemSeparatorComponent={() => <Spacer height={16} />}
renderSectionHeader={({section: {data}}) => <DayHeader ts={data[0].submittedAt} />}
sections={groupedTransactions}
renderSectionFooter={() => <Spacer height={12} />}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added the spacer here in thee footer, so the 1st row doesn't bloat blank space on screen

keyExtractor={(item) => item.id}
stickySectionHeadersEnabled={false}
nestedScrollEnabled={true}
Expand Down Expand Up @@ -109,8 +110,7 @@ const styles = StyleSheet.create({
flex: 1,
},
dayHeaderRoot: {
paddingTop: 16,
paddingBottom: 8,
paddingBottom: 4,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

paddingTop here was causing the first row to add 16 + 8 (spacer) between the locked deposit and tx history

paddingHorizontal: 20,
},
})
16 changes: 8 additions & 8 deletions apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@
"defaultMessage": "!!!Note:",
"file": "src/TxHistory/TxHistory.tsx",
"start": {
"line": 158,
"line": 161,
"column": 9,
"index": 5212
"index": 5287
},
"end": {
"line": 161,
"line": 164,
"column": 3,
"index": 5311
"index": 5386
}
},
{
"id": "components.txhistory.txhistory.warningbanner.message",
"defaultMessage": "!!!The Shelley protocol upgrade adds a new Shelley wallet type which supports delegation.",
"file": "src/TxHistory/TxHistory.tsx",
"start": {
"line": 162,
"line": 165,
"column": 11,
"index": 5324
"index": 5399
},
"end": {
"line": 165,
"line": 168,
"column": 3,
"index": 5506
"index": 5581
}
}
]
Loading