fix: naming proto

Signed-off-by: clegirar <clemntgirard@gmail.com> Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com>
berty · Dec 9, 2020 · 0756db3 · 0756db3
1 parent cc393aa
commit 0756db3
Show file tree

Hide file tree

Showing 10 changed files with 499 additions and 67 deletions.
diff --git a/js/gen.sum b/js/gen.sum
diff --git a/js/packages/api/index.d.ts b/js/packages/api/index.d.ts
@@ -5,7 +5,6 @@ import pb from './root.pb'
 import account = pb.berty.account.v1
 import messenger = pb.berty.messenger.v1
 import protocol = pb.berty.protocol.v1
-import types = pb.berty.types.v1
 import errcode = pb.berty.errcode
 
-export { account, messenger, protocol, types, errcode }
+export { account, messenger, protocol, errcode }
diff --git a/js/packages/api/index.js b/js/packages/api/index.js
@@ -4,6 +4,5 @@ export default {
 	account: pb.lookup('berty.account.v1'),
 	messenger: pb.lookup('.berty.messenger.v1'),
 	protocol: pb.lookup('.berty.protocol.v1'),
-	types: pb.lookup('.berty.types.v1'),
 	errcode: pb.lookup('.berty.errcode'),
 }
diff --git a/js/packages/components/chat/message/MessageMonitorMetadata.tsx b/js/packages/components/chat/message/MessageMonitorMetadata.tsx
@@ -8,7 +8,7 @@ import beapi from '@berty-tech/api'
 import { pbDateToNum, timeFormat } from '../../helpers'
 import { InteractionMonitorMetadata } from '@berty-tech/store/types.gen'
 
-const eventMonitorTypes = beapi.types.MonitorGroup.TypeEventMonitor
+const eventMonitorTypes = beapi.protocol.MonitorGroup.TypeEventMonitor
 
 export const MessageMonitorMetadata: React.FC<{ inte: InteractionMonitorMetadata }> = ({
 	inte,

diff --git a/js/packages/components/settings/Mode.tsx b/js/packages/components/settings/Mode.tsx
@@ -194,7 +194,7 @@ const BodyMode: React.FC<BodyModeProps> = ({ isMode }) => {
 								return
 							}
 
-							await ctx.client.replicationSetAutoEnable({
+							await ctx.client?.replicationSetAutoEnable({
 								enabled: !account.replicateNewGroupsAutomatically,
 							})
 						}}

diff --git a/js/packages/components/settings/NetworkMap.tsx b/js/packages/components/settings/NetworkMap.tsx
@@ -19,7 +19,7 @@ import { usePrevious } from '../hooks'
 import { pbDateToNum } from '../helpers'
 import { SwipeNavRecognizer } from '../shared-components/SwipeNavRecognizer'
 
-const PeerItem: React.FC<{ item: beapi.types.PeerList.IPeer; highlighted: boolean }> = ({
+const PeerItem: React.FC<{ item: beapi.protocol.PeerList.IPeer; highlighted: boolean }> = ({
 	item,
 	highlighted,
 }) => {
@@ -54,11 +54,11 @@ const PeerItem: React.FC<{ item: beapi.types.PeerList.IPeer; highlighted: boolea
 						? features.map((value) => {
 								let name, pack, fill
 								switch (value) {
-									case beapi.types.PeerList.Feature.BertyFeature:
+									case beapi.protocol.PeerList.Feature.BertyFeature:
 										name = 'berty'
 										pack = 'custom'
 										break
-									case beapi.types.PeerList.Feature.QuicFeature:
+									case beapi.protocol.PeerList.Feature.QuicFeature:
 										name = 'network'
 										pack = 'custom'
 										fill = color.dark.grey
@@ -103,7 +103,7 @@ type PeersTypes = {
 	ble: number
 }
 
-function getPeersTypes(peers: beapi.types.PeerList.IPeer[] | null) {
+function getPeersTypes(peers: beapi.protocol.PeerList.IPeer[] | null) {
 	let peersTypes = {
 		berty: 0,
 		quic: 0,
@@ -113,10 +113,10 @@ function getPeersTypes(peers: beapi.types.PeerList.IPeer[] | null) {
 	peers?.forEach((value) => {
 		value?.features?.forEach((feature) => {
 			switch (feature) {
-				case beapi.types.PeerList.Feature.BertyFeature:
+				case beapi.protocol.PeerList.Feature.BertyFeature:
 					peersTypes.berty += 1
 					break
-				case beapi.types.PeerList.Feature.QuicFeature:
+				case beapi.protocol.PeerList.Feature.QuicFeature:
 					peersTypes.quic += 1
 					break
 			}
@@ -127,9 +127,9 @@ function getPeersTypes(peers: beapi.types.PeerList.IPeer[] | null) {
 	return peersTypes
 }
 
-const NetworkMapBody: React.FC<{ peers: beapi.types.PeerList.IReply | null }> = ({ peers }) => {
+const NetworkMapBody: React.FC<{ peers: beapi.protocol.PeerList.IReply | null }> = ({ peers }) => {
 	const [{ margin, text, color }] = useStyles()
-	const [sortPeers, setSortPeers] = useState<beapi.types.PeerList.IPeer[] | null>(null)
+	const [sortPeers, setSortPeers] = useState<beapi.protocol.PeerList.IPeer[] | null>(null)
 	const [typesPeers, setTypesPeers] = useState<PeersTypes | null>(null)
 
 	const prevPeers = usePrevious(sortPeers)

diff --git a/js/packages/store/gen-type-utils.js b/js/packages/store/gen-type-utils.js
@@ -36,8 +36,8 @@ enumMapping(
 )
 enumMapping(
 	'MonitorGroupPayloadType',
-	'berty.types.v1.MonitorGroup.TypeEventMonitor',
-	'beapi.types.MonitorGroup',
+	'berty.protocol.v1.MonitorGroup.TypeEventMonitor',
+	'beapi.protocol.MonitorGroup',
 	'EventMonitor',
 )
 
@@ -82,4 +82,4 @@ const methodsHooks = (name, svcType, prefix) => {
 }
 
 methodsHooks('MessengerMethodsHooks', 'berty.messenger.v1.MessengerService', 'beapi.messenger')
-methodsHooks('ProtocolMethodsHooks', 'berty.protocol.v1.ProtocolService', 'beapi.types')
+methodsHooks('ProtocolMethodsHooks', 'berty.protocol.v1.ProtocolService', 'beapi.protocol')
diff --git a/js/packages/store/services.tsx b/js/packages/store/services.tsx
@@ -138,7 +138,7 @@ export const replicateGroup = async (
 	}
 
 	try {
-		await ctx.client.replicationServiceRegisterGroup({
+		await ctx.client?.replicationServiceRegisterGroup({
 			tokenId: tokenID,
 			conversationPublicKey: conversationPublicKey,
 		})