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

Points v1 #5174

Merged
merged 61 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
825e2dd
points tab ui
benisgold Nov 2, 2023
b97cdc0
Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …
benisgold Nov 2, 2023
274b5b1
i18n
benisgold Nov 2, 2023
2807e1c
fix
benisgold Nov 2, 2023
bc4900b
fix android
benisgold Nov 3, 2023
8939948
Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …
benisgold Nov 8, 2023
e2bea13
Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …
benisgold Nov 30, 2023
51e3347
android fix
benisgold Dec 1, 2023
8665907
Points: hook up points tab ui to metadata api (#5176)
benisgold Dec 1, 2023
4455401
Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …
benisgold Dec 2, 2023
9d2809b
Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …
benisgold Dec 7, 2023
58e1e5e
merge fix
benisgold Dec 7, 2023
1039f9b
Points fixes (#5219)
benisgold Dec 7, 2023
9a37734
add contentful points tweet intent schema and queries (#5228)
walmat Dec 7, 2023
b4c7189
Merge branch 'develop' into @benisgold/points-tab-ui
dereknelson Dec 7, 2023
2d4276c
i18n
benisgold Dec 7, 2023
e124cce
real referral url
benisgold Dec 8, 2023
fc45a1b
Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …
benisgold Dec 8, 2023
062df58
rm TAB_BAR_HEIGHT
benisgold Dec 8, 2023
55a3818
Add referral share step (#5229)
walmat Dec 8, 2023
1c9cf62
fix referral skeleton ui
benisgold Dec 8, 2023
95062bb
Merge branch '@benisgold/points-tab-ui' of https://github.com/rainbow…
benisgold Dec 8, 2023
51318d4
fix android NeonButton
benisgold Dec 8, 2023
37e1154
cleanup
benisgold Dec 8, 2023
de753fd
types
benisgold Dec 8, 2023
60972e6
add 3 dots back to calculating points
walmat Dec 8, 2023
d231c2f
fix share link
benisgold Dec 8, 2023
3ed7c7c
fix android shadow clipping
benisgold Dec 8, 2023
9382714
Merge branch '@benisgold/points-tab-ui' of https://github.com/rainbow…
benisgold Dec 8, 2023
340bb86
fix continue button not showing
walmat Dec 8, 2023
b36d532
[APP-972]: Fix back button being under the bottom tab bar (#5231)
walmat Dec 8, 2023
f521078
Merge branch '@benisgold/points-tab-ui' of https://github.com/rainbow…
walmat Dec 8, 2023
8dae7b0
1000 -> 100 bonus pts
benisgold Dec 8, 2023
2530ab4
Merge branch '@benisgold/points-tab-ui' of https://github.com/rainbow…
benisgold Dec 8, 2023
a0ef221
add a hardcoded version of tweet intent to build copy (#5235)
walmat Dec 8, 2023
b981c3c
fix placeholder on android (#5234)
walmat Dec 8, 2023
bfd4aba
add proper twitter intents
walmat Dec 8, 2023
e6ac5fd
change intent slightly
walmat Dec 8, 2023
5d42ee8
fix: rainbow text spacing and font issues
walmat Dec 8, 2023
6ca8982
fix fonts
walmat Dec 8, 2023
3e1f4a7
Bug bash fixes (#5237)
benisgold Dec 8, 2023
473c290
tweak twitter intent
benisgold Dec 8, 2023
c4f31a5
bonus points -> welcome bonus || true believer
benisgold Dec 9, 2023
743734e
block hardware wallet
benisgold Dec 9, 2023
c61bca2
leaderboard row onpress + refactor
benisgold Dec 9, 2023
f8514bf
next drop card tweak
benisgold Dec 9, 2023
3d5fd91
deeplink
benisgold Dec 9, 2023
a3a342a
referral bug fix
benisgold Dec 10, 2023
7dc2234
fix android referral code text color
benisgold Dec 10, 2023
8cdf585
attempt to fix ledger sign on console sheet
benisgold Dec 10, 2023
1defcfa
Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …
benisgold Dec 10, 2023
2e798ea
analytics events
benisgold Dec 11, 2023
946d1c3
fix android points mask
walmat Dec 11, 2023
1d8d351
Merge branch '@benisgold/points-tab-ui' of https://github.com/rainbow…
walmat Dec 11, 2023
6ce6fe0
add ledger (#5233)
skylarbarrera Dec 11, 2023
3f6f077
remove url encoded (#5240)
walmat Dec 11, 2023
584f633
added analytics events
benisgold Dec 11, 2023
f2d16ca
Merge branch '@benisgold/points-tab-ui' of https://github.com/rainbow…
benisgold Dec 11, 2023
9e26cf7
next drop rounding fix
benisgold Dec 11, 2023
3ef7524
rm console logs
benisgold Dec 11, 2023
3026af4
Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …
benisgold Dec 11, 2023
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 android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:exported="true"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustPan">
<intent-filter>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/SFMono-Medium.otf
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/SFMono-Regular.otf
Binary file not shown.
17 changes: 13 additions & 4 deletions ios/Rainbow.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
A4277DA323CFE85F0042BAF4 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4277DA223CFE85F0042BAF4 /* Theme.swift */; };
A4D04BA923D12F99008C1DEC /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4D04BA823D12F99008C1DEC /* Button.swift */; };
A4D04BAC23D12FD5008C1DEC /* ButtonManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A4D04BAB23D12FD5008C1DEC /* ButtonManager.m */; };
A9F312A50F28216E0C2FC393 /* libPods-PriceWidgetExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73790DA1833435B55F6617C8 /* libPods-PriceWidgetExtension.a */; };
AA0B1CBB2B00C5E100EAF77D /* SF-Mono-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = AA0B1CB82B00C5E100EAF77D /* SF-Mono-Semibold.otf */; };
AA0B1CBD2B00C5E100EAF77D /* SF-Mono-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = AA0B1CB92B00C5E100EAF77D /* SF-Mono-Bold.otf */; };
AA0B1CBF2B00C5E100EAF77D /* SF-Pro-Rounded-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = AA0B1CBA2B00C5E100EAF77D /* SF-Pro-Rounded-Black.otf */; };
AA6228EF24272F510078BDAA /* SF-Pro-Rounded-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = AA6228EB24272B200078BDAA /* SF-Pro-Rounded-Bold.otf */; };
AA6228F024272F510078BDAA /* SF-Pro-Rounded-Heavy.otf in Resources */ = {isa = PBXBuildFile; fileRef = AA6228EC24272B200078BDAA /* SF-Pro-Rounded-Heavy.otf */; };
AA6228F124272F510078BDAA /* SF-Pro-Rounded-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = AA6228ED24272B200078BDAA /* SF-Pro-Rounded-Medium.otf */; };
Expand Down Expand Up @@ -259,14 +261,14 @@
A4277DA223CFE85F0042BAF4 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
A4D04BA823D12F99008C1DEC /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
A4D04BAB23D12FD5008C1DEC /* ButtonManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ButtonManager.m; sourceTree = "<group>"; };
A56EC7992F140DBE3A0BC44D /* Pods-PriceWidgetExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PriceWidgetExtension.debug.xcconfig"; path = "Target Support Files/Pods-PriceWidgetExtension/Pods-PriceWidgetExtension.debug.xcconfig"; sourceTree = "<group>"; };
A873FCD38CDC7FEB5E93833F /* Pods-Rainbow.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Rainbow.debug.xcconfig"; path = "Target Support Files/Pods-Rainbow/Pods-Rainbow.debug.xcconfig"; sourceTree = "<group>"; };
AA0B1CB82B00C5E100EAF77D /* SF-Mono-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Mono-Semibold.otf"; path = "../src/assets/fonts/SF-Mono-Semibold.otf"; sourceTree = "<group>"; };
AA0B1CB92B00C5E100EAF77D /* SF-Mono-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Mono-Bold.otf"; path = "../src/assets/fonts/SF-Mono-Bold.otf"; sourceTree = "<group>"; };
AA0B1CBA2B00C5E100EAF77D /* SF-Pro-Rounded-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Rounded-Black.otf"; path = "../src/assets/fonts/SF-Pro-Rounded-Black.otf"; sourceTree = "<group>"; };
AA6228EA24272B200078BDAA /* SF-Pro-Rounded-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Rounded-Semibold.otf"; path = "../src/assets/fonts/SF-Pro-Rounded-Semibold.otf"; sourceTree = "<group>"; };
AA6228EB24272B200078BDAA /* SF-Pro-Rounded-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Rounded-Bold.otf"; path = "../src/assets/fonts/SF-Pro-Rounded-Bold.otf"; sourceTree = "<group>"; };
AA6228EC24272B200078BDAA /* SF-Pro-Rounded-Heavy.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Rounded-Heavy.otf"; path = "../src/assets/fonts/SF-Pro-Rounded-Heavy.otf"; sourceTree = "<group>"; };
AA6228ED24272B200078BDAA /* SF-Pro-Rounded-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Rounded-Medium.otf"; path = "../src/assets/fonts/SF-Pro-Rounded-Medium.otf"; sourceTree = "<group>"; };
AA6228EE24272B200078BDAA /* SF-Pro-Rounded-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Rounded-Regular.otf"; path = "../src/assets/fonts/SF-Pro-Rounded-Regular.otf"; sourceTree = "<group>"; };
AD490CBDAC6554605BF1847A /* Pods-PriceWidgetExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PriceWidgetExtension.release.xcconfig"; path = "Target Support Files/Pods-PriceWidgetExtension/Pods-PriceWidgetExtension.release.xcconfig"; sourceTree = "<group>"; };
B0C692B061D7430D8194DC98 /* ToolTipMenuTests.xctest */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = ToolTipMenuTests.xctest; sourceTree = "<group>"; };
B50C9AE92A9D18DC00EB0019 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
B50C9AEA2A9D18DC00EB0019 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -699,6 +701,9 @@
DCAC1D8CC45E468FBB7E1395 /* Resources */ = {
isa = PBXGroup;
children = (
AA0B1CB92B00C5E100EAF77D /* SF-Mono-Bold.otf */,
AA0B1CB82B00C5E100EAF77D /* SF-Mono-Semibold.otf */,
AA0B1CBA2B00C5E100EAF77D /* SF-Pro-Rounded-Black.otf */,
AA6228EB24272B200078BDAA /* SF-Pro-Rounded-Bold.otf */,
AA6228EC24272B200078BDAA /* SF-Pro-Rounded-Heavy.otf */,
AA6228ED24272B200078BDAA /* SF-Pro-Rounded-Medium.otf */,
Expand Down Expand Up @@ -871,6 +876,7 @@
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
B5D7F2F129E8D41E003D6A54 /* [email protected] in Resources */,
B54C1D1029358946007560D9 /* [email protected] in Resources */,
AA0B1CBD2B00C5E100EAF77D /* SF-Mono-Bold.otf in Resources */,
24979E8920F84250007EB0DA /* GoogleService-Info.plist in Resources */,
B54C1D162935A54F007560D9 /* [email protected] in Resources */,
B5CE8FFE29A5758100EB1EFA /* [email protected] in Resources */,
Expand All @@ -879,9 +885,11 @@
15CF49BD2889AF7C005F92C9 /* [email protected] in Resources */,
1539422824C7C7E200E4A9D1 /* Settings.bundle in Resources */,
15C398832880EDFF006033AC /* [email protected] in Resources */,
AA0B1CBB2B00C5E100EAF77D /* SF-Mono-Semibold.otf in Resources */,
B50C9AEC2A9D18DC00EB0019 /* [email protected] in Resources */,
B54C1D1129358946007560D9 /* [email protected] in Resources */,
B54C1D1229358946007560D9 /* [email protected] in Resources */,
AA0B1CBF2B00C5E100EAF77D /* SF-Pro-Rounded-Black.otf in Resources */,
15CF49C12889AFAD005F92C9 /* [email protected] in Resources */,
C04D10F025AFC8C1003BEF7A /* Extras.json in Resources */,
B5CC6D3A2A7873300037D5A3 /* [email protected] in Resources */,
Expand Down Expand Up @@ -910,6 +918,7 @@
files = (
C1AA308F27338F2B00136A9A /* SF-Pro-Rounded-Bold.otf in Resources */,
C1AA309027338F2B00136A9A /* SF-Pro-Rounded-Regular.otf in Resources */,
AA0B1CC02B00C5E100EAF77D /* SF-Pro-Rounded-Black.otf in Resources */,
C1C61A83272CBDA100E5C0B3 /* Images.xcassets in Resources */,
C1AA309227338F2B00136A9A /* SF-Pro-Rounded-Medium.otf in Resources */,
C1AA309527338F2B00136A9A /* SF-Pro-Rounded-Heavy.otf in Resources */,
Expand Down
3 changes: 3 additions & 0 deletions ios/Rainbow/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,9 @@
</array>
<key>UIAppFonts</key>
<array>
<string>SF-Mono-Bold.otf</string>
<string>SF-Mono-Semibold.otf</string>
<string>SF-Pro-Rounded-Black.otf</string>
<string>SF-Pro-Rounded-Bold.otf</string>
<string>SF-Pro-Rounded-Heavy.otf</string>
<string>SF-Pro-Rounded-Medium.otf</string>
Expand Down
Binary file added ios/SF-Mono-Bold.otf
Binary file not shown.
Binary file added ios/SF-Mono-Semibold.otf
Binary file not shown.
Binary file added ios/SF-Pro-Rounded-Black.otf
Binary file not shown.
1 change: 1 addition & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ import { initializeReservoirClient } from '@/resources/reservoir/client';
import { ReviewPromptAction } from '@/storage/schema';
import { handleReviewPromptAction } from '@/utils/reviewAlert';
import { RemotePromoSheetProvider } from '@/components/remote-promo-sheet/RemotePromoSheetProvider';
import { PointsProfileProvider } from '@/screens/points/contexts/PointsProfileContext';

if (__DEV__) {
reactNativeDisableYellowBox && LogBox.ignoreAllLogs();
Expand Down
53 changes: 53 additions & 0 deletions src/analytics/event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,30 @@ export const event = {
mintsMintingNFT: 'Minting NFT',
mintsMintedNFT: 'Minted NFT',
mintsErrorMintingNFT: 'Error Minting NFT',
pointsViewedClaimScreen: 'Viewed claim your points screen',
pointsViewedReferralScreen: 'Viewed points referral code screen',
pointsViewedPointsScreen: 'Viewed main points screen',
pointsViewedOnboardingSheet: 'Viewed points onboarding screen',
pointsReferralScreenValidatedReferralCode: 'Validated referral code',
pointsOnboardingScreenPressedSignInButton:
'Pressed sign in button on points onboarding screen',
pointsOnboardingScreenSuccessfullySignedIn:
'Successfully signed in on points onboarding screen',
pointsOnboardingScreenFailedToSignIn:
'Failed to sign in on points onboarding screen',
pointsOnboardingScreenPressedShareToXButton:
'Pressed share to X on points onboarding screen',
pointsOnboardingScreenPressedSkipShareToXButton:
'Pressed skip button on onboarding screen',
pointsOnboardingScreenPressedContinueButton:
'Pressed continue button on onboarding screen',
pointsOnboardingScreenPressedDoneButton:
'Pressed done button on onboarding screen',
pointsReferralCodeDeeplinkOpened: 'Opened points referral code deeplink',
pointsPointsScreenPressedCopyReferralCodeButton:
'Pressed copy referral code button on points screen',
pointsPointsScreenPressedShareReferralLinkButton:
'Pressed share referral link button on points screen',
} as const;

/**
Expand Down Expand Up @@ -378,4 +402,33 @@ export type EventProperties = {
};
[event.mintsPressedViewAllMintsButton]: undefined;
[event.mintsChangedFilter]: { filter: string };
[event.pointsViewedClaimScreen]: undefined;
[event.pointsViewedReferralScreen]: undefined;
[event.pointsViewedPointsScreen]: undefined;
[event.pointsViewedOnboardingSheet]: undefined;
[event.pointsReferralScreenValidatedReferralCode]: {
deeplinked: boolean;
};
[event.pointsOnboardingScreenPressedSignInButton]: {
deeplinked: boolean;
referralCode: boolean;
hardwareWallet: boolean;
};
[event.pointsOnboardingScreenSuccessfullySignedIn]: {
deeplinked: boolean;
referralCode: boolean;
hardwareWallet: boolean;
};
[event.pointsOnboardingScreenFailedToSignIn]: {
deeplinked: boolean;
referralCode: boolean;
hardwareWallet: boolean;
};
[event.pointsOnboardingScreenPressedShareToXButton]: undefined;
[event.pointsOnboardingScreenPressedSkipShareToXButton]: undefined;
[event.pointsOnboardingScreenPressedContinueButton]: undefined;
[event.pointsOnboardingScreenPressedDoneButton]: undefined;
[event.pointsReferralCodeDeeplinkOpened]: undefined;
[event.pointsPointsScreenPressedCopyReferralCodeButton]: undefined;
[event.pointsPointsScreenPressedShareReferralLinkButton]: undefined;
};
Binary file added src/assets/blurredRainbow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/fonts/SF-Mono-Bold.otf
Binary file not shown.
Binary file added src/assets/fonts/SF-Mono-Semibold.otf
Binary file not shown.
Binary file added src/assets/fonts/SF-Pro-Rounded-Black.otf
Binary file not shown.
Binary file removed src/assets/fonts/SFMono-Medium.otf
Binary file not shown.
Binary file removed src/assets/fonts/SFMono-Regular.otf
Binary file not shown.
Binary file added src/assets/planet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 73 additions & 0 deletions src/components/animations/AnimatePresence.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import React, { useEffect, useMemo, useState } from 'react';
import Animated, {
Easing,
EasingFunctionFactory,
FadeIn,
useAnimatedStyle,
withTiming,
} from 'react-native-reanimated';

interface AnimatePresenceProps {
children: React.ReactNode;
condition: boolean | null | undefined;
duration?: number;
easing?: EasingFunctionFactory;
exitDuration?: number;
exitEasing?: EasingFunctionFactory;
enterAnimation?: typeof FadeIn;
}

const defaultTimingConfig = {
duration: 225,
easing: Easing.bezier(0.2, 0, 0, 1),
};

const exitTimingConfig = {
duration: 125,
easing: Easing.bezier(0.3, 0, 1, 1),
};

export const AnimatePresence = ({
children,
condition,
duration = defaultTimingConfig.duration,
easing = defaultTimingConfig.easing,
exitEasing = exitTimingConfig.easing,
exitDuration = exitTimingConfig.duration,
enterAnimation = FadeIn,
}: AnimatePresenceProps) => {
const [isMounted, setIsMounted] = useState(condition);
const [isExiting, setIsExiting] = useState(false);

const enterAnimationStyle = useMemo(() => {
return enterAnimation.duration(duration).easing(easing.factory());
}, [enterAnimation, duration, easing]);

useEffect(() => {
if (condition) {
setIsExiting(false);
setIsMounted(true);
} else {
setIsExiting(true);
// Wait for exit animation completion
setTimeout(() => {
setIsMounted(false);
}, exitDuration || duration);
}
}, [condition, duration, exitDuration]);

const animatedStyle = useAnimatedStyle(() => {
return {
opacity: withTiming(isExiting ? 0 : 1, {
duration: exitDuration,
easing: exitEasing,
}),
};
}, [isExiting, duration, easing]);

return isMounted ? (
<Animated.View entering={enterAnimationStyle} style={animatedStyle}>
{children}
</Animated.View>
) : null;
};
8 changes: 7 additions & 1 deletion src/components/icons/TabBarIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,13 @@ export function TabBarIcon({
const backgroundColor = interpolateColor(
reanimatedPosition.value,
[index - 0.7, index - 0.3, index, index + 0.3, index + 0.7],
[accentColor, accentColor, accentColor, accentColor, accentColor]
[
accentColor ?? colors.appleBlue,
accentColor ?? colors.appleBlue,
accentColor ?? colors.appleBlue,
accentColor ?? colors.appleBlue,
accentColor ?? colors.appleBlue,
]
);
const opacity = interpolate(
reanimatedPosition.value,
Expand Down
2 changes: 2 additions & 0 deletions src/config/experimental.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const OP_REWARDS = '$OP Rewards';
export const DEFI_POSITIONS = 'Defi Positions';
export const NFT_OFFERS = 'NFT Offers';
export const MINTS = 'Mints';
export const POINTS = 'Points';
export const REMOTE_PROMO_SHEETS = 'RemotePromoSheets';

/**
Expand Down Expand Up @@ -48,6 +49,7 @@ export const defaultConfig: Record<string, ExperimentalValue> = {
[DEFI_POSITIONS]: { settings: true, value: true },
[NFT_OFFERS]: { settings: true, value: true },
[MINTS]: { settings: true, value: false },
[POINTS]: { settings: true, value: false },
[REMOTE_PROMO_SHEETS]: { settings: true, value: false },
};

Expand Down
1 change: 1 addition & 0 deletions src/design-system/typography/fontWeights.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ export const fontWeights = {
semibold: '600',
bold: '700',
heavy: '800',
black: '900',
} as const;
12 changes: 8 additions & 4 deletions src/design-system/typography/typography.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,26 @@ export const fonts = {
fontFamily: ios ? 'SF Pro Rounded' : 'SF-Pro-Rounded-Heavy',
fontWeight: ios ? fontWeights.heavy : 'normal',
},
black: {
fontFamily: ios ? 'SF Pro Rounded' : 'SF-Pro-Rounded-Black',
fontWeight: ios ? fontWeights.black : 'normal',
},
},

SFMono: {
regular: {
fontFamily: ios ? 'SF Mono' : 'SFMono-Regular',
fontFamily: ios ? 'SF Mono' : 'SF-Mono-Regular',
fontWeight: ios ? fontWeights.regular : 'normal',
},
medium: {
fontFamily: ios ? 'SF Mono' : 'SFMono-Medium',
fontFamily: ios ? 'SF Mono' : 'SF-Mono-Medium',
fontWeight: ios ? fontWeights.medium : 'normal',
},
},
} as const;

const { heavy, bold } = fonts.SFProRounded;
export const headingWeights = { heavy, bold };
const { black, heavy, bold } = fonts.SFProRounded;
export const headingWeights = { black, heavy, bold };
export const textWeights = fonts.SFProRounded;

// Sourced from https://seek-oss.github.io/capsize
Expand Down
4 changes: 2 additions & 2 deletions src/graphql/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ exports.config = {
document: './queries/metadata.graphql',
schema: { method: 'GET', url: 'https://metadata.p.rainbow.me/v1/graph' },
},
simulation: {
__name: 'simulation',
metadataPOST: {
__name: 'metadataPOST',
document: './queries/metadata.graphql',
schema: { method: 'POST', url: 'https://metadata.p.rainbow.me/v1/graph' },
},
Expand Down
4 changes: 2 additions & 2 deletions src/graphql/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export const ensClient = getEnsSdk(getFetchRequester(config.ens));
export const metadataClient = getMetadataSdk(
getFetchRequester(config.metadata)
);
export const simulationClient = getMetadataSdk(
getFetchRequester(config.simulation)
export const metadataPOSTClient = getMetadataSdk(
getFetchRequester(config.metadataPOST)
);
export const arcClient = getArcSdk(getFetchRequester(config.arc));
export const arcDevClient = getArcDevSdk(getFetchRequester(config.arcDev));
23 changes: 23 additions & 0 deletions src/graphql/queries/arc.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,26 @@ query getPromoSheet($id: String!) {
subHeader
}
}

query getPointsTweetIntentCollection($order: [PointsTweetIntentOrder]) {
pointsTweetIntentCollection(order: $order) {
items {
sys {
id
}
key
text
via
url
}
}
}

query getPointsTweetIntent($id: String!) {
pointsTweetIntent(id: $id) {
key
text
via
url
}
}
Loading
Loading