Merge pull request #263 from zallo-labs/Z-309-fix-approve

Z 309 fix approve

Author: hbriese

api/dbschema/default.esdl

@@ -62,8 +62,8 @@ module default {
 
     constraint exclusive on ((.proposal, .approver));
 
-    access policy anyone_select allow select
-      using (true);
+    access policy members_select allow select
+      using (is_member(.proposal.account));
 
     access policy user_all allow all
       using (.approver ?= global current_approver or .approver.user ?= global current_user);

api/dbschema/migrations/00005-m1qek7a.edgeql

@@ -0,0 +1,10 @@
+CREATE MIGRATION m1qek7a23nqh42rms7kw536pjj74szxn437qw75exsqiml5k55qlja
+    ONTO m1k3vtvlgbxrn6n7kipby46a6okbxajclyuvlps7djvck76yr4mfaq
+{
+  ALTER TYPE default::ProposalResponse {
+      ALTER ACCESS POLICY anyone_select RENAME TO members_select;
+  };
+  ALTER TYPE default::ProposalResponse {
+      ALTER ACCESS POLICY members_select USING (default::is_member(.proposal.account));
+  };
+};

app/src/app/(nav)/contacts/[address].tsx

@@ -5,7 +5,6 @@ import { useRouter } from 'expo-router';
 import { Address, ZERO_ADDR, asAddress, asChain, asUAddress, tryAsUAddress } from 'lib';
 import { RemoveIcon } from '@theme/icons';
 import { useForm } from 'react-hook-form';
-import { StyleSheet } from 'react-native';
 import { View } from 'react-native';
 import { Menu } from 'react-native-paper';
 import { AppbarMore } from '#/Appbar/AppbarMore';
@@ -15,7 +14,6 @@ import { Actions } from '#/layout/Actions';
 import { FormResetIcon } from '#/fields/ResetFormIcon';
 import { useConfirmRemoval } from '~/hooks/useConfirm';
 import { withSuspense } from '#/skeleton/withSuspense';
-import { ScrollableScreenSurface } from '#/layout/ScrollableScreenSurface';
 import { Chain } from 'chains';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useSelectedChain } from '~/hooks/useSelectedAccount';
@@ -28,6 +26,8 @@ import { useLazyLoadQuery } from 'react-relay';
 import { Address_ContactScreenQuery } from '~/api/__generated__/Address_ContactScreenQuery.graphql';
 import { useUpsertContact } from '~/hooks/mutations/useUpsertContact';
 import { useRemoveContact } from '~/hooks/mutations/useRemoveContact';
+import { Scrollable } from '#/Scrollable';
+import { createStyles } from '@theme/styles';
 
 const Query = graphql`
   query Address_ContactScreenQuery($address: UAddress!, $include: Boolean!) {
@@ -117,7 +117,7 @@ function ContactScreen_(props: ContactScreenProps) {
         })}
       />
 
-      <ScrollableScreenSurface>
+      <Scrollable>
         <View style={styles.fields}>
           <FormTextField label="Name" name="name" control={control} required />
 
@@ -143,12 +143,12 @@ function ContactScreen_(props: ContactScreenProps) {
             {current ? 'Update' : 'Add'}
           </FormSubmitButton>
         </Actions>
-      </ScrollableScreenSurface>
+      </Scrollable>
     </Pane>
   );
 }
 
-const styles = StyleSheet.create({
+const styles = createStyles({
   fields: {
     gap: 16,
     margin: 16,

app/src/app/(nav)/token/[address].tsx

@@ -10,24 +10,26 @@ import { Menu } from 'react-native-paper';
 import { AppbarOptions } from '#/Appbar/AppbarOptions';
 import { withSuspense } from '#/skeleton/withSuspense';
 import { ScreenSkeleton } from '#/skeleton/ScreenSkeleton';
-import { ScrollableScreenSurface } from '#/layout/ScrollableScreenSurface';
 import { z } from 'zod';
 import { zHex, zUAddress } from '~/lib/zod';
 import { useLocalParams } from '~/hooks/useLocalParams';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { ListItem } from '#/list/ListItem';
 import { CHAINS } from 'chains';
 import { View } from 'react-native';
-import { createStyles } from '@theme/styles';
+import { createStyles, useStyles } from '@theme/styles';
 import { Button } from '#/Button';
 import { ExternalLinkIcon, GenericTokenIcon } from '@theme/icons';
 import { ICON_SIZE } from '@theme/paper';
-import { graphql, ROOT_ID } from 'relay-runtime';
+import { graphql } from 'relay-runtime';
 import { useLazyLoadQuery } from 'react-relay';
 import { useUpsertToken } from '~/hooks/mutations/useUpsertToken';
 import { Address_TokenScreenQuery } from '~/api/__generated__/Address_TokenScreenQuery.graphql';
 import { useRemoveToken } from '~/hooks/mutations/useRemoveToken';
-import { useInvalidateQueryOn, useQuery } from '~/api/useQuery';
+import { useInvalidateQueryOn } from '~/api/useQuery';
+import { Scrollable } from '#/Scrollable';
+import { Pane } from '#/layout/Pane';
+import { ItemList } from '#/layout/ItemList';
 
 const PYTH_PRICE_FEEDS_URL = 'https://pyth.network/developers/price-feed-ids';
 
@@ -68,6 +70,7 @@ const TokenScreenParams = z.object({ address: zUAddress() });
 
 function TokenScreen_() {
   const { address: token } = useLocalParams(TokenScreenParams);
+  const { styles } = useStyles(stylesheet);
   const router = useRouter();
   const chain = asChain(token);
 
@@ -90,7 +93,7 @@ function TokenScreen_() {
   const iconValid = !!tryOrIgnore(() => icon && new URL(icon));
 
   return (
-    <>
+    <Pane flex>
       <AppbarOptions
         headline="Token"
         {...(query.token?.userOwned && {
@@ -110,19 +113,23 @@ function TokenScreen_() {
         })}
       />
 
-      <ScrollableScreenSurface contentContainerStyle={styles.sheet}>
-        <ListItem
-          leading={
-            icon && iconValid ? (
-              <Image source={[{ uri: icon }]} style={styles.icon} />
-            ) : (
-              GenericTokenIcon
-            )
-          }
-          headline={`${name || 'Token'} (${symbol || 'TKN'})`}
-          supporting={asAddress(token)}
-          trailing={CHAINS[chain].name}
-        />
+      <Scrollable contentContainerStyle={styles.sheet}>
+        <ItemList>
+          <ListItem
+            leading={
+              icon && iconValid ? (
+                <Image source={[{ uri: icon }]} style={styles.icon} />
+              ) : (
+                GenericTokenIcon
+              )
+            }
+            headline={`${name || 'Token'} (${symbol || 'TKN'})`}
+            supporting={asAddress(token)}
+            trailing={CHAINS[chain].name}
+            containerStyle={styles.item}
+          />
+        </ItemList>
+
         <View style={styles.fields}>
           <FormTextField label="Name" name="name" placeholder="Token name" control={control} />
 
@@ -167,15 +174,18 @@ function TokenScreen_() {
             {query.token ? 'Update' : 'Add'}
           </FormSubmitButton>
         </Actions>
-      </ScrollableScreenSurface>
-    </>
+      </Scrollable>
+    </Pane>
   );
 }
 
-const styles = createStyles({
+const stylesheet = createStyles(({ colors }) => ({
   sheet: {
     paddingTop: 8,
   },
+  item: {
+    backgroundColor: colors.surface,
+  },
   fields: {
     marginVertical: 16,
     marginHorizontal: 16,
@@ -185,7 +195,7 @@ const styles = createStyles({
     width: ICON_SIZE.medium,
     height: ICON_SIZE.medium,
   },
-});
+}));
 
 export default withSuspense(TokenScreen_, <ScreenSkeleton />);