Add proposal name to overview, move provider

helium · Dec 5, 2023 · b8fac6c · b8fac6c
1 parent eab4f44
commit b8fac6c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 26 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -874,9 +874,9 @@ SPEC CHECKSUMS:
   FBLazyVector: f1897022b53abf1469d6ad692ee2c69f57d967f3
   FBReactNativeSpec: 627fd07f1b9d498c9fa572e76d7f1a6b1ee9a444
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  glog: 791fe035093b84822da7f0870421a25839ca7870
   helium-react-native-sdk: 17b612b2dacebc8f10c18ba5611f200a81c940f9
-  hermes-engine: 0784cadad14b011580615c496f77e0ae112eed75
+  hermes-engine: 7a53ccac09146018a08239c5425625fdb79a6162
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   lottie-ios: 25e7b2675dad5c3ddad369ac9baab03560c5bfdd
   lottie-react-native: c9f1db4f4124dcce9f8159e65d8dc6e8bcb11fb4
@@ -886,7 +886,7 @@ SPEC CHECKSUMS:
   MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
   MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
   OneSignalXCFramework: 81ceac017a290f23793443323090cfbe888f74ea
-  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
+  RCT-Folly: 85766c3226c7ec638f05ad7cb3cf6a268d6c4241
   RCTRequired: bd6045fbd511da5efe6db89eecb21e4e36bd7cbf
   RCTTypeSafety: c06d9f906faa69dd1c88223204c3a24767725fd8
   React: b9ea33557ef1372af247f95d110fbdea114ed3b2

diff --git a/src/App.tsx b/src/App.tsx
@@ -37,6 +37,7 @@ import { useAccountStorage } from './storage/AccountStorageProvider'
 import { useNotificationStorage } from './storage/NotificationStorageProvider'
 import { BalanceProvider } from './utils/Balance'
 import { useDeepLinking } from './utils/linking'
+import { GovernanceProvider } from './storage/GovernanceProvider'
 
 SplashLib.preventAutoHideAsync().catch(() => {
   /* reloading the app might trigger some race conditions, ignore them */
@@ -136,12 +137,14 @@ const App = () => {
                                       <ModalProvider>
                                         <WalletSignProvider>
                                           <JupiterProvider>
-                                            <AutoGasBanner />
-                                            <NetworkAwareStatusBar />
-                                            <RootNavigator />
+                                            <GovernanceProvider>
+                                              <AutoGasBanner />
+                                              <NetworkAwareStatusBar />
+                                              <RootNavigator />
 
-                                            {/* place app specific modals here */}
-                                            <InsufficientSolConversionModal />
+                                              {/* place app specific modals here */}
+                                              <InsufficientSolConversionModal />
+                                            </GovernanceProvider>
                                           </JupiterProvider>
                                         </WalletSignProvider>
                                       </ModalProvider>

diff --git a/src/features/governance/GovernanceNavigator.tsx b/src/features/governance/GovernanceNavigator.tsx
@@ -3,7 +3,6 @@ import {
   createStackNavigator,
 } from '@react-navigation/stack'
 import React, { memo } from 'react'
-import { GovernanceProvider } from '@storage/GovernanceProvider'
 import { PortalHost } from '@gorhom/portal'
 import GovernanceScreen from './GovernanceScreen'
 import ProposalScreen from './ProposalScreen'
@@ -17,23 +16,21 @@ const screenOptions: StackNavigationOptions = {
 const GovernanceStackScreen = () => {
   return (
     <>
-      <GovernanceProvider>
-        <GovernanceStack.Navigator screenOptions={screenOptions}>
-          <GovernanceStack.Screen
-            name="GovernanceScreen"
-            component={GovernanceScreen}
-          />
-          <GovernanceStack.Screen
-            name="VotingPowerScreen"
-            component={VotingPowerScreen}
-          />
-          <GovernanceStack.Screen
-            name="ProposalScreen"
-            component={ProposalScreen}
-          />
-        </GovernanceStack.Navigator>
-        <PortalHost name="GovernancePortalHost" />
-      </GovernanceProvider>
+      <GovernanceStack.Navigator screenOptions={screenOptions}>
+        <GovernanceStack.Screen
+          name="GovernanceScreen"
+          component={GovernanceScreen}
+        />
+        <GovernanceStack.Screen
+          name="VotingPowerScreen"
+          component={VotingPowerScreen}
+        />
+        <GovernanceStack.Screen
+          name="ProposalScreen"
+          component={ProposalScreen}
+        />
+      </GovernanceStack.Navigator>
+      <PortalHost name="GovernancePortalHost" />
     </>
   )
 }

diff --git a/src/features/governance/ProposalCard.tsx b/src/features/governance/ProposalCard.tsx
@@ -182,6 +182,7 @@ export const ProposalCard = ({
           {derivedState === 'active' && (
             <Text
               variant="body2"
+              marginTop="xs"
               color="surfaceSecondaryText"
               numberOfLines={2}
             >

diff --git a/src/features/governance/ProposalScreen.tsx b/src/features/governance/ProposalScreen.tsx
@@ -241,6 +241,11 @@ export const ProposalScreen = () => {
                     </Box>
                   ))}
               </Box>
+              <Box flexShrink={1} marginTop="ms">
+                <Text variant="subtitle3" color="primaryText">
+                  {proposal?.name}
+                </Text>
+              </Box>
               <Box marginTop="ms">
                 <Box flexDirection="row" justifyContent="space-between">
                   <Box>