update buttons in onboarding wizard to prefvent dom render issue on web

kibagateaux · Aug 3, 2024 · 13f73fd · 13f73fd
1 parent 7c4fd98
commit 13f73fd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/public/_redirects b/public/_redirects
@@ -0,0 +1 @@
+/* /index.html 200
diff --git a/src/components/modals/BaseModal.tsx b/src/components/modals/BaseModal.tsx
@@ -22,15 +22,15 @@ const BaseModal: React.FC<ModalProps> = ({ children, onClose, primaryButton, sec
     const textStyles = {
         color: theme.primaryTextColor,
     };
-    const renderButton = (config) => {
+    const renderButton = (config, color) => {
         console.log('base modal button', config);
 
         if (!config) return null;
         if (config.button) return config.button;
         if (config.title && config.onPress)
             return (
                 <TouchableOpacity
-                    style={[styles.button, { backgroundColor: theme.primaryBackgroundColor }]}
+                    style={[styles.button, { backgroundColor: color }]}
                     onPress={config.onPress}
                 >
                     <Text style={[styles.text, textStyles]}>{config.title}</Text>
@@ -48,17 +48,9 @@ const BaseModal: React.FC<ModalProps> = ({ children, onClose, primaryButton, sec
                 {children}
                 <View>
                     <View style={styles.ctaContainer}>
-                        {renderButton(primaryButton)}
-                        {secondaryButton && (
-                            <TouchableOpacity
-                                style={[styles.button, { backgroundColor: theme.secondaryColor }]}
-                                onPress={secondaryButton.onPress}
-                            >
-                                <Text style={[styles.text, textStyles]}>
-                                    {secondaryButton.title}
-                                </Text>
-                            </TouchableOpacity>
-                        )}
+                        {renderButton(primaryButton, theme.primaryBackgroundColor)}
+                        {secondaryButton &&
+                            renderButton(secondaryButton, theme.secondaryBackgroundColor)}
                     </View>
                     <Button title="Close" color="purple" onPress={closeModal} />
                 </View>

diff --git a/src/inventory/github.ts b/src/inventory/github.ts
@@ -82,7 +82,6 @@ const item: InventoryItem = {
             description: 'Give your jinni access to your code repos to learn from your daily adds',
             provider: ITEM_ID,
             canDo: async (status: ItemStatus) => (status === 'equipped' ? 'idle' : 'unequipped'),
-            displayType: 'none',
             do: async () => {
                 track(ABILITY_SYNC_REPOS, {
                     spell: ABILITY_SYNC_REPOS,
@@ -154,7 +153,6 @@ const item: InventoryItem = {
             description: 'Jinni will learn from what you have been working on',
             provider: ITEM_ID,
             canDo: async (status: ItemStatus) => (status === 'equipped' ? 'idle' : 'unequipped'),
-            displayType: 'none',
             do: async () => {
                 track(ABILITY_TRACK_COMMITS, {
                     spell: ABILITY_TRACK_COMMITS,

diff --git a/src/inventory/maliks-majik.ts b/src/inventory/maliks-majik.ts
@@ -90,7 +90,6 @@ const item: InventoryItem = {
             provider: ITEM_ID,
             symbol: '🧞‍♂️',
             description: 'Get access to the full game',
-            displayType: 'none',
             canDo: async (status: ItemStatus) => {
                 // @dev implicit check for PROOF_MAJIK
                 if (status !== 'equipped') return 'unequipped';
@@ -161,7 +160,6 @@ const item: InventoryItem = {
             name: 'Create Mystic Crypt',
             provider: ITEM_ID,
             symbol: '🏦',
-            displayType: 'none',
             description:
                 "Save game progress to your phone'scloud storage to restore account if you lose your phone",
             canDo: async (status: ItemStatus) => {
@@ -196,6 +194,7 @@ const item: InventoryItem = {
             canDo: async () => 'unequipped',
             do: async () => async () => true,
         }),
+        // TODO add speak intentions as widget. displayType 'avatar'
     ),
 };
 

diff --git a/src/inventory/spotify.ts b/src/inventory/spotify.ts
@@ -89,7 +89,6 @@ const item: InventoryItem = {
             symbol: '🎶',
             description: 'Share a playlist on Spotify with another player',
             provider: ITEM_ID,
-            displayType: 'none',
             canDo: async (status: ItemStatus) => (status === 'equipped' ? 'idle' : 'unequipped'),
             do: async () => {
                 // const pid = await getStorage(ID_PLAYER_SLOT);
@@ -132,7 +131,6 @@ const item: InventoryItem = {
             description: 'Share your Spotfiy profile with another player',
             provider: ITEM_ID,
             canDo: async (status: ItemStatus) => (status === 'equipped' ? 'idle' : 'unequipped'),
-            displayType: 'none',
             do: async () => {
                 console.log('Spotify:Ability:ShareProfile');
                 track(TRACK_SHARE_CONTENT, {

diff --git a/src/utils/config.ts b/src/utils/config.ts
@@ -292,6 +292,8 @@ export const getStorage: <T>(slot: string, useMysticCrypt?: boolean) => Promise<
     slot,
     useMysticCrypt,
 ) => {
+    console.log('get storage 0', Platform.OS, Platform.OS === 'web', slot);
+
     try {
         if (!slot) return null;
         const cached = await getCached.cache.get(JSON.stringify({ slot, secure: useMysticCrypt }));