diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d2ba632d8..f9f3093a35 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ jobs: generate: docker: - - image: bertychat/protoc:v3 + - image: bertychat/protoc:v4 working_directory: /go/src/berty.tech environment: GOPATH: /go diff --git a/build/docker/protoc/Dockerfile b/build/docker/protoc/Dockerfile index c55357d43d..064af95f1d 100644 --- a/build/docker/protoc/Dockerfile +++ b/build/docker/protoc/Dockerfile @@ -13,17 +13,18 @@ RUN go get -u -v \ moul.io/protoc-gen-gotemplate \ golang.org/x/tools/cmd/goimports \ github.com/99designs/gqlgen \ - github.com/99designs/gorunpkg \ + github.com/vektah/gorunpkg \ github.com/spf13/cobra RUN cd /go/src/github.com/99designs/gqlgen && git checkout v0.6.0 && go install github.com/99designs/gqlgen RUN rm -f /go/bin/web-editor FROM golang:1.11-alpine -RUN apk --no-cache add git make protobuf gcc libc-dev && mkdir -p /.cache/go-build && chmod -R 777 /.cache +RUN apk --no-cache add git make protobuf gcc libc-dev nodejs-npm && mkdir -p /.cache/go-build && chmod -R 777 /.cache +RUN mkdir -p /node/ && cd /node && npm install -g prettier prettier-eslint prettier-eslint-cli COPY --from=pgg /go/bin/* /go/bin/ COPY --from=builder /go/bin/* /go/bin/ COPY --from=pgg /protobuf /protobuf ENV GOPATH=/go \ - PATH=/go/bin:${PATH} \ + PATH=/go/bin:/node/node_modules/.bin:${PATH} \ GOROOT=/usr/local/go diff --git a/build/docker/protoc/Makefile b/build/docker/protoc/Makefile index fa34cc8c07..ac1c2476e9 100644 --- a/build/docker/protoc/Makefile +++ b/build/docker/protoc/Makefile @@ -1,4 +1,4 @@ -IMAGE ?= bertychat/protoc:v3 +IMAGE ?= bertychat/protoc:v4 build: docker build --pull -t $(IMAGE) . diff --git a/client/react-native/common/components/Screens/Settings/Devtools/EventList.js b/client/react-native/common/components/Screens/Settings/Devtools/EventList.js index 2db0487d36..b0bbe28b94 100644 --- a/client/react-native/common/components/Screens/Settings/Devtools/EventList.js +++ b/client/react-native/common/components/Screens/Settings/Devtools/EventList.js @@ -14,7 +14,7 @@ import { import { Pagination } from '../../../../relay' import { borderBottom, marginLeft, padding } from '../../../../styles' import { colors } from '../../../../constants' -import { fragments, mutations, queries } from '../../../../graphql' +import { fragments, mutations, queries, enums } from '../../../../graphql' import Button from '../../../Library/Button' const Item = fragments.Event(({ data, navigation }) => ( @@ -51,8 +51,8 @@ const Item = fragments.Event(({ data, navigation }) => ( 2: , }[data.direction] }{' '} - Kind - {' ' + data.kind} + {enums.ValueBertyP2pKindInputKind[data.kind]} + {' (' + data.kind + ')'}