Merge branch 'next'

OriginProtocol · Jun 15, 2024 · 09a754f · 09a754f
2 parents 2ece488 + afbfc2d
commit 09a754f
Show file tree

Hide file tree

Showing 7 changed files with 1,865 additions and 2 deletions.
diff --git a/libs/defi/ogn/src/staking/components/StakeRewardModal.tsx b/libs/defi/ogn/src/staking/components/StakeRewardModal.tsx
@@ -57,7 +57,7 @@ import {
 } from '@tanstack/react-table';
 import { addMonths, formatDuration } from 'date-fns';
 import { useIntl } from 'react-intl';
-import { formatUnits } from 'viem';
+import { formatUnits, parseUnits } from 'viem';
 import { useAccount } from 'wagmi';
 
 import { useStartLockupPolling } from '../hooks';
@@ -96,7 +96,10 @@ export const StakeRewardModal = (props: DialogProps) => {
     label: approvalLabel,
   } = useApprovalButton({
     token: tokens.mainnet.OGN,
-    amount: amount + (info?.xOgnRewards ?? 0n),
+    amount:
+      amount +
+      (info?.xOgnRewards ?? 0n) +
+      parseUnits('1', tokens.mainnet.OGN.decimals),
     spender: tokens.mainnet.xOGN.address,
     enableAllowance: true,
   });

diff --git a/libs/defi/shared/src/generated/graphql.ts b/libs/defi/shared/src/generated/graphql.ts
diff --git a/libs/defi/shared/src/queries/snapshot.generated.ts b/libs/defi/shared/src/queries/snapshot.generated.ts
@@ -480,6 +480,7 @@ export type SpaceVoting = {
 };
 
 export type SpaceWhere = {
+  controller?: InputMaybe<Scalars['String']['input']>;
   created?: InputMaybe<Scalars['Int']['input']>;
   created_gt?: InputMaybe<Scalars['Int']['input']>;
   created_gte?: InputMaybe<Scalars['Int']['input']>;
@@ -576,10 +577,13 @@ export type User = {
   __typename?: 'User';
   about?: Maybe<Scalars['String']['output']>;
   avatar?: Maybe<Scalars['String']['output']>;
+  cover?: Maybe<Scalars['String']['output']>;
   created: Scalars['Int']['output'];
+  github?: Maybe<Scalars['String']['output']>;
   id: Scalars['String']['output'];
   ipfs?: Maybe<Scalars['String']['output']>;
   name?: Maybe<Scalars['String']['output']>;
+  twitter?: Maybe<Scalars['String']['output']>;
 };
 
 export type UsersWhere = {

diff --git a/libs/governance/proposals/src/snapshot.generated.ts b/libs/governance/proposals/src/snapshot.generated.ts
@@ -480,6 +480,7 @@ export type SpaceVoting = {
 };
 
 export type SpaceWhere = {
+  controller?: InputMaybe<Scalars['String']['input']>;
   created?: InputMaybe<Scalars['Int']['input']>;
   created_gt?: InputMaybe<Scalars['Int']['input']>;
   created_gte?: InputMaybe<Scalars['Int']['input']>;
@@ -576,10 +577,13 @@ export type User = {
   __typename?: 'User';
   about?: Maybe<Scalars['String']['output']>;
   avatar?: Maybe<Scalars['String']['output']>;
+  cover?: Maybe<Scalars['String']['output']>;
   created: Scalars['Int']['output'];
+  github?: Maybe<Scalars['String']['output']>;
   id: Scalars['String']['output'];
   ipfs?: Maybe<Scalars['String']['output']>;
   name?: Maybe<Scalars['String']['output']>;
+  twitter?: Maybe<Scalars['String']['output']>;
 };
 
 export type UsersWhere = {

diff --git a/libs/governance/shared/src/generated/graphql.ts b/libs/governance/shared/src/generated/graphql.ts
diff --git a/libs/oeth/shared/src/generated/graphql.ts b/libs/oeth/shared/src/generated/graphql.ts
diff --git a/libs/ousd/shared/src/generated/graphql.ts b/libs/ousd/shared/src/generated/graphql.ts