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

Redeem merch #42

Merged
merged 3 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Components/EventDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const EventDropdown: React.FC<EventDropdownProps> = ({ token, onEventSelect }) =
const eventData = await getEvents(token);
setEvents([{
eventId: 'checkin',
name: 'checkin'
name: 'Check In'
}, ...eventData]);
} catch (error) {
console.error('Error fetching events:', error);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rp-mobile-2024",
"version": "1.5.1",
"version": "1.5.2",
"main": "node_modules/expo/AppEntry.js",
"scripts": {
"start": "expo start",
Expand Down
6 changes: 2 additions & 4 deletions screens/AdminScanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ const AdminScanner: React.FC = () => {
<ButtonText color={Colors.WHITE}>Scanned!</ButtonText>
</StyledButton>
) : (
<StyledButton styleVariant="scan"
onPress={() => setScanned(true)}
>
<ButtonText color={Colors.WHITE}>Tap to Scan Again </ButtonText>
<StyledButton styleVariant="scan">
<ButtonText color={Colors.WHITE}>Ready to Scan Again </ButtonText>
</StyledButton>
)
}
Expand Down
Loading