Merge pull request #41 from AmbireTech/develop

Release v0.7.0

Author: sonytooo

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.0",
+  "version": "0.7.0",
   "name": "ambire-common",
   "description": "Common ground for the Ambire apps",
   "private": true,

src/constants/multiplierBadges.ts

@@ -0,0 +1,38 @@
+export type MultiplierBadge = {
+  id: string
+  name: string
+  icon: string
+  color: string
+  multiplier: number
+  link: string
+}
+
+export const multiplierBadges: MultiplierBadge[] = [
+  {
+    id: 'beta-tester',
+    name: 'Beta Testers',
+    icon: '🧪',
+    color: '#6000FF',
+    multiplier: 1.25,
+    link: 'https://blog.ambire.com/announcing-the-wallet-token-a137aeda9747'
+  },
+  {
+    id: 'lobsters',
+    name: 'Lobsters',
+    icon: '🦞',
+    color: '#E82949',
+    multiplier: 1.5,
+    link: 'https://blog.ambire.com/ambire-wallet-to-partner-with-lobsterdao-10b57e6da0-53c59c88726b'
+  },
+  {
+    id: 'cryptoTesters',
+    name: 'CryptoTesters',
+    icon: '🧑‍🔬',
+    color: '#b200e1',
+    multiplier: 1.25,
+    link: 'https://blog.ambire.com/win-a-cryptotesters-nft-with-ambire-and-get-into-one-of-the-hottest-web3-communities-c9d7185760b1'
+  }
+]
+
+export const MULTIPLIERS_READ_MORE_URL =
+  'https://blog.ambire.com/announcing-the-wallet-token-a137aeda9747'

src/hooks/accounts/index.ts

@@ -0,0 +1,4 @@
+import useAccounts from './useAccounts'
+
+export * from './types'
+export default useAccounts

src/hooks/network/index.ts

@@ -0,0 +1,42 @@
+import { UseStorageProps, UseStorageReturnType } from '../useStorage'
+import { UseToastsReturnType } from '../useToasts'
+
+export type OnAddAccountOptions = {
+  shouldRedirect?: boolean
+  isNew?: boolean
+  select?: boolean
+}
+
+export type Account = {
+  baseIdentityAddr: string
+  bytecode: string
+  email: string
+  id: string
+  identityFactoryAddr: string
+  primaryKeyBackup: string
+  salt: string
+  signer: {
+    one: string
+    quickAccManager: string
+    timelock: number
+    two: string
+    // Sometimes passed as an extra prop
+    address?: string
+  }
+}
+
+export interface UseAccountsProps {
+  onAdd: (opts: OnAddAccountOptions) => void
+  onRemoveLastAccount: () => void
+  useStorage: (p: Omit<UseStorageProps, 'storage'>) => UseStorageReturnType
+  useToasts: () => UseToastsReturnType
+}
+
+export interface UseAccountsReturnType {
+  accounts: Account[]
+  account: Account | {}
+  selectedAcc: string
+  onSelectAcc: (accountId: Account['id']) => void
+  onAddAccount: (acc: Account, opts: OnAddAccountOptions) => void
+  onRemoveAccount: (accountId: Account['id']) => void
+}

src/hooks/useAccounts/index.ts

@@ -1,47 +1,6 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 
-import { UseToastsReturnType } from '../toasts'
-import { UseStorageProps, UseStorageReturnType } from '../useStorage'
-
-export type onAddAccountOptions = {
-  shouldRedirect?: boolean
-  isNew?: boolean
-  select?: boolean
-}
-
-export type Account = {
-  baseIdentityAddr: string
-  bytecode: string
-  email: string
-  id: string
-  identityFactoryAddr: string
-  primaryKeyBackup: string
-  salt: string
-  signer: {
-    one: string
-    quickAccManager: string
-    timelock: number
-    two: string
-    // Sometimes passed as an extra prop
-    address?: string
-  }
-}
-
-export interface UseAccountsProps {
-  onAdd: (opts: onAddAccountOptions) => void
-  onRemoveLastAccount: () => void
-  useStorage: (p: Omit<UseStorageProps, 'storage'>) => UseStorageReturnType
-  useToasts: () => UseToastsReturnType
-}
-
-export interface UseAccountsReturnType {
-  accounts: Account[]
-  account: Account | {}
-  selectedAcc: string
-  onSelectAcc: (accountId: Account['id']) => void
-  onAddAccount: (acc: Account, opts: onAddAccountOptions) => void
-  onRemoveAccount: (accountId: Account['id']) => void
-}
+import { Account, OnAddAccountOptions, UseAccountsProps, UseAccountsReturnType } from './types'
 
 export default function useAccounts({
   onAdd,
@@ -84,7 +43,7 @@ export default function useAccounts({
   )
 
   const onAddAccount = useCallback(
-    (acc: Account, _opts: onAddAccountOptions = {}) => {
+    (acc: Account, _opts: OnAddAccountOptions = {}) => {
       const opts = { shouldRedirect: true, ..._opts }
 
       if (!(acc.id && acc.signer)) throw new Error('account: internal err: missing ID or signer')

src/hooks/useAccounts/types.ts

@@ -1,3 +1,4 @@
 import useAddressBook from './useAddressBook'
 
 export default useAddressBook
+export * from './types'

src/hooks/accounts/accounts.ts src/hooks/useAccounts/useAccounts.tssrc/hooks/accounts/accounts.ts renamed to src/hooks/useAccounts/useAccounts.ts

@@ -0,0 +1,22 @@
+import { UseAccountsReturnType } from '../useAccounts'
+import { UseStorageProps, UseStorageReturnType } from '../useStorage'
+import { UseToastsReturnType } from '../useToasts'
+
+export type Address = {
+  name: string
+  address: string
+  isUD: boolean
+}
+
+export interface UseAddressBookProps {
+  useAccounts: () => UseAccountsReturnType
+  useStorage: (p: Omit<UseStorageProps, 'storage'>) => UseStorageReturnType
+  useToasts: () => UseToastsReturnType
+}
+
+export interface UseAddressBookReturnType {
+  addresses: Address[]
+  addAddress: (name: Address['name'], address: Address['address'], isUD: Address['isUD']) => void
+  removeAddress: (name: Address['name'], address: Address['address'], isUD: Address['isUD']) => void
+  isKnownAddress: (address: Address['address']) => boolean
+}

src/hooks/useAddressBook/index.ts

@@ -3,17 +3,9 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { isKnownTokenOrContract, isValidAddress } from '../../services/address'
 import { setKnownAddresses } from '../../services/humanReadableTransactions'
-import { UseAccountsReturnType } from '../accounts'
-import { UseToastsReturnType } from '../toasts'
-import { UseStorageProps, UseStorageReturnType } from '../useStorage'
-
-interface Props {
-  useAccounts: () => UseAccountsReturnType
-  useStorage: (p: Omit<UseStorageProps, 'storage'>) => UseStorageReturnType
-  useToasts: () => UseToastsReturnType
-}
+import { UseAddressBookProps, UseAddressBookReturnType } from './types'
 
-const accountType = ({ email, signerExtra }: any) => {
+const accountType = ({ email, signerExtra }: any): string => {
   const walletType =
     // eslint-disable-next-line no-nested-ternary
     signerExtra && signerExtra.type === 'ledger'
@@ -24,7 +16,11 @@ const accountType = ({ email, signerExtra }: any) => {
   return email ? `Ambire account for ${email}` : `Ambire account (${walletType})`
 }
 
-const useAddressBook = ({ useAccounts, useStorage, useToasts }: Props) => {
+const useAddressBook = ({
+  useAccounts,
+  useStorage,
+  useToasts
+}: UseAddressBookProps): UseAddressBookReturnType => {
   const { accounts } = useAccounts()
   const { addToast } = useToasts()
   const [storageAddresses, setStorageAddresses] = useStorage({ key: 'addresses', defaultValue: [] })