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

Fix wrong icon of income in top 5 home functions #618

Merged
merged 14 commits into from
Oct 19, 2024
Merged

Fix wrong icon of income in top 5 home functions #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3355516
fix: fix parsing foundation bank payment
SunnyCloudYang Oct 10, 2024
3ed9b56
fix: improve null safety in getBankPayment function
SunnyCloudYang Oct 10, 2024
5c43b82
Merge branch 'thu-info-community:master' into master
SunnyCloudYang Oct 11, 2024
a24fa14
chore: lockfile maintenance
actions-user Oct 11, 2024
85a921a
fix: fix parsing foundation bank payment
SunnyCloudYang Oct 11, 2024
ddde871
Merge branch 'master' of https://github.com/SunnyCloudYang/thu-info-app
SunnyCloudYang Oct 11, 2024
7ce55cd
fix: reorder condition to improve bank payment parsing logic
SunnyCloudYang Oct 11, 2024
05106ac
Merge branch 'master' into master
SunnyCloudYang Oct 12, 2024
e6c58f7
fix: fix condition and add a end hint
SunnyCloudYang Oct 12, 2024
0442000
fix: convert to lf
SunnyCloudYang Oct 14, 2024
dd156fa
Added a canellation action to avoid data being applied after switchin…
84634E1A607A Oct 14, 2024
e12ca4a
Merge branch 'thu-info-community:master' into master
SunnyCloudYang Oct 14, 2024
7754d14
fix: fix wrong icon for income
SunnyCloudYang Oct 18, 2024
5b2d2c6
Merge branch 'thu-info-community:master' into master
SunnyCloudYang Oct 18, 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
6 changes: 3 additions & 3 deletions apps/thu-info-app/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2043,12 +2043,12 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
boost: 4cb898d0bf20404aab1850c656dcea009429d6c1
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
FBLazyVector: 430e10366de01d1e3d57374500b1b150fe482e6d
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
hermes-engine: ea92f60f37dba025e293cbe4b4a548fd26b610a0
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
RCTDeprecation: 726d24248aeab6d7180dac71a936bbca6a994ed1
RCTRequired: a94e7febda6db0345d207e854323c37e3a31d93b
RCTTypeSafety: 28e24a6e44f5cbf912c66dde6ab7e07d1059a205
Expand Down
3 changes: 2 additions & 1 deletion apps/thu-info-app/src/ui/home/home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import IconSports from "../../assets/icons/IconSports";
import IconBook from "../../assets/icons/IconBook";
import IconBankPayment from "../../assets/icons/IconBankPayment";
import IconInvoice from "../../assets/icons/IconInvoice";
import IconIncome from "../../assets/icons/IconIncome";
// import IconEleRecharge from "../../assets/icons/IconEleRecharge";
import IconLibRoom from "../../assets/icons/IconLibRoom";
import themes from "../../assets/themes/themes";
Expand Down Expand Up @@ -798,7 +799,7 @@ const getHomeFunctions = (
navigation.navigate("Income");
}
}}>
<IconInvoice width={iconSize} height={iconSize} />
<IconIncome width={iconSize} height={iconSize} />
</HomeIcon>,
<HomeIcon
key="campusMap"
Expand Down
Loading